commit | ea5f6a74c046564ef93457ecf2e3634a362302e2 | [log] [tgz] |
---|---|---|
author | Chen Xu <fionaxu@google.com> | Wed Jul 06 23:42:41 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jul 06 23:42:41 2016 +0000 |
tree | e1ce571c68111e31fc36fef9b9eeb6d2a22db6af | |
parent | 83f71845af1a4cf7ef3afb0f4695dba8b679b674 [diff] | |
parent | e5643a13c4b6aa5d10360681e1365ce059e701c9 [diff] |
Merge \\\\"DO NOT MERGE revert system api loadSafeLabel\\\\" into mnc-dev am: d2e2288fe3 am: 59fc768893 am: 69a071e55c am: e5643a13c4 -s ours Change-Id: I68bfaeedf5290ea792aa0570e68e24d0d6dada11