summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-09 23:27:49 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-11-09 23:27:49 +0000
commitf3fba91cbd2a7b056660c257e14b96798c974dcd (patch)
treec0c1434efac7994e39152c293e0ac65ab075af9d /tools/aapt2/java/JavaClassGenerator_test.cpp
parent1e4fa4d09fcdb97b083962420d06b0884b8be028 (diff)
parentc4863cf1d13a9c2f071175f427d7f772da09ad31 (diff)
Merge "[automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into pi-dev am: be1f0f2863 -s ours am: 8b691cfcea am: 547f99bbda -s ours am: f9052f7905 am: 3215114ad6 -s ours"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions