Merge \\\"DO NOT MERGE add private function convertSafeLable\\\" into mnc-dev am: 26af9db300 am: d36c2d23e0
am: be24b21235

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