am 587488e0: am 81eeef58: Merge "Update time when turning on screen, in...
am 587488e0: am 81eeef58: Merge "Update time when turning on screen, in addition to waking up" into mnc-dev
* commit '587488e0':
Update time when turning on screen, in addition to waking up