summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-03-12 22:53:19 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-03-12 22:53:19 -0700
commit20ce1174b82c42c993458b015c8d9cfa961f4b92 (patch)
treefaf106927d66133f479d3dc470b55bb8c77a8dee /tools/aapt2/java/JavaClassGenerator.cpp
parent443ef127e1b2f81998e5605f530d2dbd5e64b988 (diff)
parentd82de1d48499f654829af8caa68c1eb59187cbdc (diff)
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" am: a5fe44c6b5 -s ours
am: d82de1d484 -s ours am skip reason: subject contains skip directive Change-Id: I5860bb0aecbaf101773a7b92589899c60cf0dd88
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions