tree 811699ee66560ffde27463bd234ae847294bb9b6
parent 73ba86fc9ac951f5ad4ce1ae6d2feff778477707
parent a08113255b9bcc2c8923f48a41080948c482466e
author Patrick Baumann <patb@google.com> 1595624863 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595624863 +0000

Merge "Fix unintended preferred activity reset" into rvc-dev am: 69b18e57fc am: a08113255b

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

Change-Id: Ie6e90cdc7ec8cd2788bf3501b869cbe7d3e026c8