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

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