tree 0de45d07fc5687f2511193394f7106f2fc7ac48a
parent f22d8c2e1f011a31e56db45cab07c98a2a03ad9a
parent 2cca828ec5186105723ae85e618bfca0bb59cdb8
author Bobby Georgescu <georgescu@google.com> 1369761320 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369761320 -0700

am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce

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