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)
commite79013abc5d54d648d09153291e7ee7c16f97d2c
tree4ff0af59bbec9d739d5a13f36d35e1ab24bd1b9a
parentcaaddf4a80cbb81cefdda3dbdafb74f319c2872e
parent562414813ab2dd8ca0df4149d12c588e12101d00
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