OSDN Git Service

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


Trivial merge