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:13 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-21 21:48:13 +0000
commitba1f3a29eaf308aae4909a7d39c384d4bcb27e20 (patch)
treeb1263ba556120b874fd34e54b6595e5fe9228e64 /tools/aapt2/java/JavaClassGenerator.cpp
parent55d5e6f80e7eeed749b6bfeb296cea9db8c95ff4 (diff)
parentbc51c1afcd99a2d6aad57118e5bf6ee2cfea6634 (diff)
Merge "docs: Fix note about new intent action changes coming with Android 11. am: e69b8a9006 am: 53f6fe0a82 am: 8293d8aba7" into rvc-qpr-dev-plus-aosp am: bc51c1afcd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12418304 Change-Id: Idc913033def92a02f262d718cc5b8288159cc228
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions