[automerger skipped] Merge "Fix race condition in QSTileHost" into tm-dev am: f349915128 am: 1de35a9ff4 -s ours am: 7c26952eff -s ours am: 179cc2af9c -s ours
am skip reason: Merged-In I6ffbb7510e6854f18bc427d1ae1e782918c799dc with SHA-1 6098b8f68b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19416449
Change-Id: I0e955554c2b8643e644d41d9555ccf6b46ebf2d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: