diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-29 15:53:52 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-29 15:53:52 +0000 |
commit | f615871c4572f348a9cd74c7e15af6c1f4f34d88 (patch) | |
tree | fe7ea7e2c489fa59051d89a7776820bba7ad6d49 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 612d9e85e681efeacf73b45ccb41d93147996ff0 (diff) | |
parent | caef6680b2c96af6e13a2f62233d10bde329444d (diff) |
[automerger skipped] Merge "Tests no screenshot is copied when user consent timed out" into qt-qpr1-dev am: caef6680b2 -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: I01724d3de2dd2a62daeb5c7a7bc9e7a907d6f04d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions