| commit | b8b3fda1902748e0b3321e045afabfae5a85939f | [log] [tgz] |
|---|---|---|
| author | Chen Xu <fionaxu@google.com> | Fri Jul 01 23:20:56 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 01 23:20:56 2016 +0000 |
| tree | 6da2937c116fed7cfd74fcf4bee0645560653518 | |
| parent | b5ce41f34fa8427c626961e26b6d847b410359de [diff] | |
| parent | cdbd5f7fbb25011cb99ce80204c86285c7f8268a [diff] |
Merge \\\\\\\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\\\\\\" into lmp-dev am: 521efcd1e3 -s ours am: 7bd0eea999 am: 0828455ca9 am: caabaab8bc -s ours am: 67f8e822ac am: f82ca1f3e9 am: 0f741391c3 am: 4000bdb3ea -s ours am: 1d5fbe43ab am: cdbd5f7fbb Change-Id: Icd7c3843359b4e77791b3cc7c0de43e49ecd62d7