tree 144c8fa2ce7d1c616f9a56b347f42e4821bc8bbd
parent 9b3f6fc61879751899f4e6fb79b006eec6d7fe61
parent 631b1f2b33707fc11e054a158be7dfb26f375c42
author TreeHugger Robot <treehugger-gerrit@google.com> 1646716768 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646716768 +0000

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into rvc-qpr-dev am: d4ef6e49a1 -s ours am: e4f01f7717 -s ours am: 631b1f2b33 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17102592

Change-Id: I840af3e39c8dc3a741625230c510bdf341e2682b