summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/AnnotationProcessor.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-25 01:28:57 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-25 01:28:57 +0000
commit86dcf8432133e911f800e4bf0efcca345b4a0c96 (patch)
treeca12a6f7e331f5fca406df9ec850d2e0b1229b98 /tools/aapt2/java/AnnotationProcessor.cpp
parent1b1c8dae4b96dadae9f526352871b73e298f6e8a (diff)
parenta4f0c932202b612c431676bbef8b2fa3fbafe950 (diff)
Merge "Merge "Make broadcast protected" into rvc-d1-dev am: 1263a94728 am: 55dd6be49e" into rvc-qpr-dev-plus-aosp am: a4f0c93220
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12228948 Change-Id: Ib2c1969b49ece1b96f8f659f3d18c1dc83270186
Diffstat (limited to 'tools/aapt2/java/AnnotationProcessor.cpp')
0 files changed, 0 insertions, 0 deletions