Merge \\"DO NOT MERGE add private function converSafeLabel\\" into lmp-dev am: 18d33742b6  -s ours
am: dffa158e60

Change-Id: I6b712e8591b1dff407f5e12c1a9a918b6f0fa3ef
tree: 64ca051b3d1837e693b1aea9fd1d18434d2bf024
  1. src/
  2. tests/
  3. tools/
  4. Android.mk
  5. CleanSpec.mk
  6. README.txt