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-07-10 07:10:42 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-10 07:10:42 +0000
commitf5113bf3459736fc963bc95f7b6c4c9042cd9ca5 (patch)
tree0f5418bf619667b14f24351196b6a5643c3ab6d6 /tools/aapt2/java/JavaClassGenerator.cpp
parentfd913216148c23ba2794b7a938bed1c1206c0767 (diff)
parent4b5f1dde3e66ec8c41da9736bfd233c20884d4ff (diff)
Merge "Merge "Don't assume r.curApp is valid when finalizing broadcasts" into rvc-dev am: 33e8dc7978 am: b3f96855a8 am: ee77a1bd52" into rvc-qpr-dev-plus-aosp am: 4b5f1dde3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12088000 Change-Id: I74075a40d616bd2d400b9c28a3f268574a1c8377
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions