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

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