tree bef20e43568f2fc6356a5f4623722754d2c3a4c3
parent bbb13e732ffc9c255d81f985f87e748a008ac969
parent 96a6b4aa0298ccea21aac7a7ba1cfe7b0737a9f4
author Issei Suzuki <issei@google.com> 1655934894 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1655934894 +0000

Merge "Ignore overriding pending animaiton for unlock transition." into tm-dev am: 6eaacb50f2 am: 96a6b4aa02

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

Change-Id: I07f653a44483d343397f086e0da603a70dc7ba6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>