OSDN Git Service

Merge "Keep screen on for user-initiated slideshow." into jb-dev
authorWei Huang <weih@google.com>
Tue, 29 May 2012 20:11:12 +0000 (13:11 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 29 May 2012 20:11:12 +0000 (13:11 -0700)

Trivial merge