summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorfionaxu <fionaxu@google.com>2016-07-06 23:50:10 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-06 23:50:10 +0000
commitfb55beefc86217a95405efc0020e0664e9a9d2be (patch)
treea4defdf53a912c35e965d13397df01e2eb71a3b5 /tools/aapt2/java/JavaClassGenerator.cpp
parent68d98965c5035afa30c9cb12932fb5f9e45f0788 (diff)
parentea5f6a74c046564ef93457ecf2e3634a362302e2 (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: Iab0c0cb2bf1a83ac5f7cb94e4763757078aa6740
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions