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-20 23:47:24 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-20 23:47:24 +0000
commit6545593da0de8edade870a0fae723d47667e46a4 (patch)
tree004ff57bf97c4be84ed397c1fa45f72f53498ced /tools/aapt2/java/JavaClassGenerator.cpp
parentc00a1a956c782b8e935d0d17b39e462cc64c41d0 (diff)
parenta51dbd6edf7714334685ecf835d1e37894aa9b14 (diff)
Merge "Merge "Merge "Resume-on-Reboot: remove special string" into rvc-dev am: 4daab7b2d6 am: d7808d3dd9" into rvc-d1-dev-plus-aosp am: 0441a937ac" into rvc-qpr-dev-plus-aosp am: a51dbd6edf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12181452 Change-Id: I103ceb8eb3f9fbd2e4359329f5a4fe39809caf08
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions