summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-21 21:48:39 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-21 21:48:39 +0000
commit5db4c839432add327e88cffb1e8ff623bcf829ff (patch)
treeb1263ba556120b874fd34e54b6595e5fe9228e64 /tools/aapt2/java/JavaClassGenerator.cpp
parentba1f3a29eaf308aae4909a7d39c384d4bcb27e20 (diff)
parent9fa492bcd69e2497be7d09c804cdcd805e9ce0a0 (diff)
Merge "Merge "docs: Fix note about new intent action changes coming with Android 11. am: e69b8a9006 am: d3093ce956" into rvc-d1-dev-plus-aosp am: 5f53a927a6" into rvc-qpr-dev-plus-aosp am: 9fa492bcd6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12418304 Change-Id: I46d8ec0c7176fd8cbb11dd73824b38d6cacd1a1b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions