summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorfionaxu <fionaxu@google.com>2016-07-07 01:50:25 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-07 01:50:25 +0000
commit09f525b80815202f1af43cef7201ea2241f5fe0f (patch)
tree66bed4f7d81c45d59f5bf0e981271c39fcc71f4e /tools/aapt2/java/JavaClassGenerator.cpp
parent91b80ee9c9c478b5f1045bde97d9c69e48d94923 (diff)
parentced2efecd3b17369324154e05bbdae0d535475ca (diff)
Merge \\\\\\\"DO NOT MERGE revert system api loadSafeLabel\\\\\\\" into mnc-dev am: d2e2288fe3 am: 59fc768893 am: 69a071e55c am: e5643a13c4 -s ours am: ea5f6a74c0 am: fb55beefc8
am: ced2efecd3 -s ours Change-Id: Ie7c6e3bad56d3a6252aeae968469b25c44baf235
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions