tree 2460b1d72b1524741bd93edcd3d01d06a49894d8
parent 714ff9d10bdeb220c5c16c3e72fce10a5a95dd69
parent 4d1c56c7fdfb08c02e853e3d1157bb47cfcd0dc2
author bsears <bsears@google.com> 1563947766 -0700
committer android-build-merger <android-build-merger@google.com> 1563947766 -0700

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

Change-Id: Ib4740c14d6810be4076a7f66de5ffd40ebdf7a45