commit | f82ca1f3e9f6c24060e7e5d9fed3c6940ef79c12 | [log] [tgz] |
---|---|---|
author | fionaxu <fionaxu@google.com> | Fri Jul 01 22:38:28 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jul 01 22:38:28 2016 +0000 |
tree | 38133e2234fc8c87c0320471e030968e8879fc23 | |
parent | f437bd068c026de2501dd602332f8b7765dd9ebd [diff] | |
parent | 67f8e822acd065dcbae9dce4109a70034fcf0314 [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 Change-Id: I54214d329e81a59e418cc9f4a5ff150b6348a8c2