tree 5981cdfae5e7db64de2d7320542a3e3789669ce6
parent 03ba73c4789c7c5f19d9db9e6e8adb8a3336dd87
parent 57a5d3b0d999519f47c094a8fa0bf4ad5467928b
author fionaxu <fionaxu@google.com> 1467413747 +0000
committer android-build-merger <android-build-merger@google.com> 1467413747 +0000

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 am: 3f2d5d24b3
am: 57a5d3b0d9

Change-Id: Idb7d670e3a31616e223f24b7c527b8963f0d2591