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