tag | a4036580c13ea5bd7083edbb77b800e1d51e6579 | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 04 09:47:41 2016 -0700 |
object | 94ada5cb4fce4520cc456924a32f4f52bba14bde |
Android 6.0.1 Release 72 (M4B30X)
commit | 94ada5cb4fce4520cc456924a32f4f52bba14bde | [log] [tgz] |
---|---|---|
author | fionaxu <fionaxu@google.com> | Thu Jun 30 15:47:35 2016 -0700 |
committer | gitbuildkicker <android-build@google.com> | Tue Aug 16 15:52:33 2016 -0700 |
tree | 01554d191e6ced239bfe49439db5afcc0af2e38f | |
parent | 2a74727f3e67f5218e78aaf7974cd8eeeb458e76 [diff] |
DO NOT MERGE add private function convertSafeLable Bug: 28557603 Change-Id: I8d6a13a71011c38e7dd7039fa7ae0a69cf6adc2e Merge conflict resolution of ag/1193341 to mnc-dr1.6-release Change-Id: I44cec7b2f841fb01a0dcaf2d512de2e53b59dad6