summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@google.com>2019-09-12 11:49:21 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-12 11:49:21 -0700
commit176dc51978c8833a9e727defb55333b5221aff21 (patch)
treec695bfca142cda8e0c1fea921f69cc24f1aee33d /tools/aapt2/java/JavaClassGenerator.cpp
parentc65d1dfde8c5188becaefd7bd5214a29af88a5f5 (diff)
parent01e625c3be1af0e93accfd5b0b0871b1f2b48dc0 (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev am: 7633a081ab am: b0054f0518 am: c97dfb57a8 -s ours am: 40a236db41 -s ours am: b3c4ddb61e am: 29d4d347da am: 74c25744ee
am: 01e625c3be -s ours am skip reason: subject contains skip directive Change-Id: I68a9fc55864ba83eae26bc8735eed518270dfcd8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions