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

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