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)
commitf1f02b6ec5998102257f0c60d61b0b07df796064
tree81b4a8cf0d3a73430f92c6131fa31b8831212297
parentcde8d1762af242a89aeea6062b185e7717da5a62
parentafb3d1d8f341620f6b69d47d52b515f53817aa91
Merge "Keep screen on for user-initiated slideshow." into jb-dev