diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-03-07 09:25:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-07 09:25:46 +0000 |
| commit | f36ed930cda018b1e0c38254880747bcb0f0391e (patch) | |
| tree | 4a9b6fc39c0156f0a5cfc4943d3a00482844a7fa /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 92e566d24f9e421455e8969ecef4e6f7e7d6ac36 (diff) | |
| parent | 9d5c0bf1b1ac091539d5503c50a68bd45e7ad387 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16812573
Change-Id: I50789965770642edef8730349b6e386b9587963c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions