tree 1cdca0b4d327bfbc048050843a2606c95bbd17a6
parent 48ea8c95ce791804ac11e5baa579ce8d9597fae3
parent 5649024a41ec6167d04a6fefd82c33be072ef774
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623781902 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1623781902 +0000

Merge "Merge "Don't rely on intent to call back from activity tracker" into sc-dev am: 1b369c4763 am: f620e72ad6" into sc-v2-dev-plus-aosp