OSDN Git Service

am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb...
authorBobby Georgescu <georgescu@google.com>
Tue, 28 May 2013 17:15:20 +0000 (10:15 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 May 2013 17:15:20 +0000 (10:15 -0700)
* commit 'e3336dc35f514e3b5dd7a15f9a86eaf6d1572b5e':
  Prevent lock screen appearing during active slideshow


Trivial merge