tree 7650592826271413efc39a1c633eeed09fa5d35c
parent 07715f906a6b53162853b8113c220fb94a4b6047
parent f400177a95b9000c74198f6859504ba226fb05da
author Chris Tate <ctate@android.com> 1591223760 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591223760 +0000

[automerger skipped] Merge "More fixes towards the race conditions in AMS" into pi-dev am: f56666c524 -s ours am: 0295276dfa -s ours am: f400177a95 -s ours

am skip reason: Change-Id I6e0bdc8c02bab54f6278096b3a3acadd97c064c6 with SHA-1 5f647cd3f2 is in history

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

Change-Id: I60e6222ee005ef72da26e093a44c954bd507e8ac