OSDN Git Service

Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce
authorBobby Georgescu <georgescu@google.com>
Tue, 28 May 2013 17:14:17 +0000 (17:14 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 28 May 2013 17:14:18 +0000 (17:14 +0000)

Trivial merge