tree cc7ce05ac7482a5723c5d92cf74bb144e93faa77
parent e41c18d629d65e302d4c40f2582845225da0d4f4
parent 81eeef589386483722c21572d9ab6d3f95dd26be
author Jorim Jaggi <jjaggi@google.com> 1439510309 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439510309 +0000

am 81eeef58: Merge "Update time when turning on screen, in addition to waking up" into mnc-dev

* commit '81eeef589386483722c21572d9ab6d3f95dd26be':
  Update time when turning on screen, in addition to waking up