OSDN Git Service

am c4ef64c8: am c1aaf4b5: am e3336dc3: Merge "Prevent lock screen appearing during...
authorBobby Georgescu <georgescu@google.com>
Tue, 28 May 2013 20:50:46 +0000 (13:50 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 May 2013 20:50:46 +0000 (13:50 -0700)
* commit 'c4ef64c8cc8ba7edc543f64efcb25c401cc94466':
  Prevent lock screen appearing during active slideshow


Trivial merge