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