OSDN Git Service

am 8de9d445: (-s ours) am 81eeef58: Merge "Update time when turning on screen, in...
authorJorim Jaggi <jjaggi@google.com>
Thu, 27 Aug 2015 10:23:11 +0000 (10:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:23:11 +0000 (10:23 +0000)
* commit '8de9d4458347a00333a340e1400a0ef0fe7da9ab':


Trivial merge