commit | e3336dc35f514e3b5dd7a15f9a86eaf6d1572b5e | [log] [tgz] |
---|---|---|
author | Bobby Georgescu <georgescu@google.com> | Tue May 28 17:14:17 2013 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 28 17:14:18 2013 +0000 |
tree | 872ab3d03c1b3042d816d1423e3ca179c5492eab | |
parent | 461e101fb99df1a704544efb29e56ece25788985 [diff] | |
parent | ef132358deba6acbbeaf0a63014c77c98bca1d9a [diff] |
Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce