Merge "RESTRICT AUTOMERGE Force screen freezing timeout to unfreeze" into tm-qpr-dev am: 3222c82692
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21809542 Change-Id: Ia860018c4dcb729fa0b8d29985617003eb3f2ddc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: