[automerger skipped] Merge "Fix race condition wen setting boot color sysprops (round 2)" into sc-qpr1-dev am: fe6f6a0110 -s ours am: a94168ee5c -s ours

am skip reason: Merged-In I7d304d442e3f6839ad047944cae21dc07d7c3dea with SHA-1 684b66adb2 is already in history

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

Change-Id: I51d9e2d7946f2cc876ce2b2f29b934261bfd80f1
This commit is contained in:
Shan Huang
2021-09-25 02:31:42 +00:00
committed by Automerger Merge Worker

Diff Content Not Available