| commit | 60af59ca1956af4aa974290f7a80a348a15eac53 | [log] [tgz] |
|---|---|---|
| author | Chen Xu <fionaxu@google.com> | Fri Jul 01 23:02:18 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 01 23:02:18 2016 +0000 |
| tree | 87d575ec4c1c385cc8edcf6f2d40d3d841704faf | |
| parent | ec38092fbbb04e9e25c25bf96e706fa6074a1a98 [diff] | |
| parent | 4f3a1918c30d26e022bd7afab0bec4d4ee23e328 [diff] |
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 am: 4f3a1918c3 -s ours Change-Id: I5ad35b1dea83f31131c4a827931ee5a2ceed3704