tree ccdd24f29fd9d3f8fd2d85ebfbdb7ebdab16c7e1
parent a822fb621bd87467cddced2fe3d905177b3d8a86
parent 486ba92b4e851ee3c3bdb7acdc266bd367186732
author Louis Chang <louischang@google.com> 1597295128 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597295128 +0000

Merge "Avoid deadlock during boot up" into rvc-qpr-dev am: 486ba92b4e

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

Change-Id: I760ea39d7635c69c8bee6444585a050a47c8838c