OSDN Git Service

am f1f02b6e: Merge "Keep screen on for user-initiated slideshow." into jb-dev
authorWei Huang <weih@google.com>
Tue, 29 May 2012 20:14:15 +0000 (13:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 29 May 2012 20:14:15 +0000 (13:14 -0700)
commit20582d2f79f82f8a8529753194c863d1593ad08c
tree6068609887d315e35ec98e5a5a99fae3ed5910ab
parent601a18b3d77a95e37585d051d8de2802bf3c84a4
parentf1f02b6ec5998102257f0c60d61b0b07df796064
am f1f02b6e: Merge "Keep screen on for user-initiated slideshow." into jb-dev

* commit 'f1f02b6ec5998102257f0c60d61b0b07df796064':
  Keep screen on for user-initiated slideshow.