diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-29 16:09:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-29 16:09:12 +0000 |
commit | 098e00c136745ef682f2e6bba8e106ffbba47272 (patch) | |
tree | 088aaa31dc651ef671716df8ddd916ffefd72e30 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | e54728c407169065a8b404a6fbd805bd6f0c0d99 (diff) | |
parent | f615871c4572f348a9cd74c7e15af6c1f4f34d88 (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 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: Ic34356706b303ee23da9ef3a07c6a9776966abbb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions