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:28:40 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-11-09 23:28:40 +0000
commite5d716c29b9a0e82d95a2d7fb7b7e2b6ae3fcd73 (patch)
treec0c1434efac7994e39152c293e0ac65ab075af9d /tools/aapt2/java/JavaClassGenerator_test.cpp
parentf69202039a7dc31b6797810c005a660e1224c00e (diff)
parent1d6b576933b754bba94da4592897670cc9fb4043 (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: d43cdd3ec7 am: f0f44cdcaa am: ada794bdd3 -s ours"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions