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-06-22 09:55:56 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-22 09:55:56 +0000
commit47e8d78857d4008ec78eed034d902b28e37c8add (patch)
tree47b50e114c14bd874e31828ef78b52cedb0c5068 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent97870607d19af95741dbee786758093a3289e91c (diff)
parent9f51ef5eb48bce7c6053f55610a0b4a947e6c459 (diff)
Merge "Merge "Make PendingIntent immutable and correct Settings package name" into rvc-dev am: 438073fcfe am: d34fdc53da" into rvc-d1-dev-plus-aosp am: 570633d976 am: 9f51ef5eb4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881938 Change-Id: Ib0becad45c1a0474370f613de364be81f0772906
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions