tree c5c929a2c47f917c8c8b00c2c251b4e2bf4375a2
parent ae8a9b971f7dc63e455b08b5ec737c2a0cacf76c
parent 8cd2973a9f19a01bc72abd5b48a463a0fce067c1
author bsears <bsears@google.com> 1563933060 -0700
committer android-build-merger <android-build-merger@google.com> 1563933060 -0700

[automerger skipped] Merge "Don't animate clock when turning screen off." into qt-dev am: 486503c74e
am: 8cd2973a9f -s ours
am skip reason: change_id If39777340b72bc623d6690bc4f784c7f5c26ea8d with SHA1 dc8fee7ea1 is in history

Change-Id: Ica34780e45dd46847182a4f758244e3285993e12