tree ce64143958c400f393114a05985d06b8456da534
parent a7876727b0b405fec8dcbe82443c233c7493fa08
author Yingdi Yu <yuyingdi@gmail.com> 1395787703 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> 1399673771 -0700

namespace: try to resolve ndn and std conflicts

Change-Id: I141ead4b8f30ce75bae73974e47e6e5acd75a296