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

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