| commit | f8c7bff9f5b88fb83696e192c3ff343fa810c5b9 | [log] [tgz] |
|---|---|---|
| author | Bobby Georgescu <georgescu@google.com> | Tue May 28 10:15:20 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 28 10:15:20 2013 -0700 |
| tree | 0de45d07fc5687f2511193394f7106f2fc7ac48a | |
| parent | f22d8c2e1f011a31e56db45cab07c98a2a03ad9a [diff] | |
| parent | 2cca828ec5186105723ae85e618bfca0bb59cdb8 [diff] |
am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce * commit 'e3336dc35f514e3b5dd7a15f9a86eaf6d1572b5e': Prevent lock screen appearing during active slideshow