diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-03-07 10:31:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-07 10:31:28 +0000 |
| commit | fdefecb795e15b1a6eaee9ae7ef42abfab311f0d (patch) | |
| tree | 02cb2dc007fbc7a00f4ba278c95fc361958f1c02 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a14f29c5fda782ca21cbb5cb7c7022acd36a2bc8 (diff) | |
| parent | 44d3952d8f461a617e1bec1a399d12389f8abf86 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into qt-dev am: 88bdf80af8 am: c0d12c6b4a -s ours am: 9d5c0bf1b1 -s ours am: f36ed930cd -s ours am: fb7b70bdb4 -s ours am: 44d3952d8f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16812573
Change-Id: Ibe631082ebfbafed204d5cef904f7a5426142410
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions