| commit | c1aaf4b526507245428ef56a03727a5d0fb68659 | [log] [tgz] |
|---|---|---|
| author | Bobby Georgescu <georgescu@google.com> | Tue May 28 10:15:02 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 28 10:15:02 2013 -0700 |
| tree | b2d0c18c45d984eff256339e72ac9c92f624caba | |
| parent | c4edd18dcd6fa025a059b45e2f4c827569a24ac5 [diff] | |
| parent | e3336dc35f514e3b5dd7a15f9a86eaf6d1572b5e [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