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)
commitf33ba01a9dcab55e669aeec80b94d71f8a0516ec
tree4ff0af59bbec9d739d5a13f36d35e1ab24bd1b9a
parent5c2a64cfa8f6a7a31d49a0bc119d6ffdd13611f4
parente79013abc5d54d648d09153291e7ee7c16f97d2c
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