tree 313d9813397dde1ce49776d714a08f606f4d0450
parent c9cb6df0c048f02154a33a0ed325046838a636fc
parent 181d454887306a3ef2b7b985925a32ce55281cf8
author TreeHugger Robot <treehugger-gerrit@google.com> 1646623323 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646623323 +0000

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into sc-v2-dev am: 351f990172 am: 181d454887 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia3e38ce50fdfafaf284d87e7b68e0c016561351f