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)
commitc4ef64c8cc8ba7edc543f64efcb25c401cc94466
tree4ff0af59bbec9d739d5a13f36d35e1ab24bd1b9a
parentf6f4abec09afda4d802ac0b7b2006d86a6161892
parentc1aaf4b526507245428ef56a03727a5d0fb68659
am c1aaf4b5: am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce

* commit 'c1aaf4b526507245428ef56a03727a5d0fb68659':
  Prevent lock screen appearing during active slideshow