tree 8736c2fb2ce4fe516797bb80f0976a85b148e4b0
parent f2629d481e19e43235ea4546ab53443fbd432988
parent 5c918ee029276efe090e82086fd4089d7686e60f
author Adam Lesinski <adamlesinski@google.com> 1456170834 +0000
committer android-build-merger <android-build-merger@google.com> 1456170834 +0000

Merge "DO NOT MERGE ANYWHERE: Don\'t change screen on time on time changes" into mnc-dr-dev am: 3e439db8c8  -s ours am: 83fd156e21  -s ours
am: 5c918ee029  -s ours

* commit '5c918ee029276efe090e82086fd4089d7686e60f':
  DO NOT MERGE ANYWHERE: Don't change screen on time on time changes