tree cf6c648fa9b9b96502dee78cfc6e15140828fda9
parent 20c518816a0946dff67a3b99b929bc30c9b0ad6c
parent 9d89bd5cb891dbc9b45b72aa291cbb9fc39b023c
author Adam Lesinski <adamlesinski@google.com> 1456166822 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1456166823 +0000

Merge "DO NOT MERGE ANYWHERE: Don't change screen on time on time changes" into mnc-dr-dev