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:46:39 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-20 23:46:39 +0000
commitc00a1a956c782b8e935d0d17b39e462cc64c41d0 (patch)
tree004ff57bf97c4be84ed397c1fa45f72f53498ced /tools/aapt2/java/JavaClassGenerator.cpp
parent6e6c3ec037d5bfff3965be23fd0f4c3564e44b53 (diff)
parent321525ac8c8d3453dcb512379b59b738402891bb (diff)
Merge "Merge "Resume-on-Reboot: remove special string" into rvc-dev am: 4daab7b2d6 am: 5cb5825c09 am: 2b80409306" into rvc-qpr-dev-plus-aosp am: 321525ac8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12181452 Change-Id: I7f161bbbf7a76002c40b3ce7ad0849e83d683a10
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions