summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorMichele <mberionne@google.com>2019-10-23 23:56:59 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-10-23 23:56:59 -0700
commit779782f905ec601b2091c3f5f3be5b478f09949c (patch)
tree55b3cc1fb11b24d921e2413b0da64397554d21ee /tools/aapt2/java/JavaClassGenerator.cpp
parentf1e6ce104741057a104e9639f117ed801cadff08 (diff)
parenta0cacabe2181b12fd151bbbdd88afd2f9e02b372 (diff)
[automerger skipped] Merge "Replace Rlog with Log in CarrierDefaultApp" am: 2cbb5a9f2d am: 56b33d2e93 am: 8ea0b11e0e
am: a0cacabe21 -s ours am skip reason: change_id Ib7ba43701b1a22ada0d8f5954c57b96bfa9f0489 with SHA1 bce5f0dee3 is in history Change-Id: Iaa2985fbfe4dcc5d6e1c20a6000b326a2290ec8d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions