summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-06 15:51:51 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-06 15:51:51 +0000
commit7b6bf11eb0c3fcd00aee61abf602e9240886b6a4 (patch)
tree7096a1d2892dabd4b89117e4c620fda0eefab3c8 /tools/aapt2/java/JavaClassGenerator_test.cpp
parenta863a988c4e26da0349b654a4fdb5266d7f1d1ea (diff)
parent4d67aaecda758c55d68a9b5378a003a8988720a7 (diff)
Merge "Merge "Correctly offset app op history on reboot" into rvc-dev am: 0ce4fba38f am: 2d56a15699 am: 219316d707" into rvc-qpr-dev-plus-aosp am: 4d67aaecda
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11747376 Change-Id: I01a830e46b36ae7c773bce2a3ec8d80b1920d389
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions