summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorChen Xu <fionaxu@google.com>2016-07-07 01:37:57 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-07 01:37:57 +0000
commitced2efecd3b17369324154e05bbdae0d535475ca (patch)
treedc4c7869808b090ae6f65566f9f0d45fcb999e02 /tools/aapt2/java/JavaClassGenerator.cpp
parentf2da1cf7e67b88d1ef13c733fe3a08f6ef6c9fd0 (diff)
parentfb55beefc86217a95405efc0020e0664e9a9d2be (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 Change-Id: I2ca8a734fbcaf1860e39df6cdb4cdad0e065f5ea
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions