diff options
author | fionaxu <fionaxu@google.com> | 2016-07-07 01:25:21 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-07 01:25:21 +0000 |
commit | e1df7dfa2200bd8bdae7c7086f5fde07692cd30e (patch) | |
tree | b74d23d20c8d67e938b97c0b2b6b2e8e25b0a09c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | c526ad0e89a5d425c889713d56916d7c7a14b138 (diff) | |
parent | ea5f6a74c046564ef93457ecf2e3634a362302e2 (diff) |
Merge \\\\\"DO NOT MERGE revert system api loadSafeLabel\\\\\" into mnc-dev am: d2e2288fe3 am: 59fc768893 am: 69a071e55c am: e5643a13c4 -s ours
am: ea5f6a74c0
Change-Id: I2b35540b9d12712aa80149d54a9c35203e35a84e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions