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

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