summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-06-29 16:32:57 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-29 16:32:57 +0000
commit21a09d84b655b8fd9c777d116f043f933715f185 (patch)
tree31f40bba2f99fe65bfad54c77d1c1dc31246f159 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent19a0701e430d9e8c366d15343df3a893802edb30 (diff)
parent0d15339d3a2c7e8a411ce9790ae71d0052d35e7a (diff)
[automerger skipped] Merge "Tests no screenshot is copied when user consent timed out" into qt-qpr1-dev am: caef6680b2 -s ours am: f615871c45 -s ours am: 098e00c136 -s ours am: 0d15339d3a -s ours
am skip reason: Change-Id I5bc8fcbff908258a20c5515a6ba092ceab1cc447 with SHA-1 9516a007c5 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11947527 Change-Id: I9fde8ab96a47fe2afee0a1fc1455e982214fc1c0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions