OSDN Git Service

am 20582d2f: am f1f02b6e: Merge "Keep screen on for user-initiated slideshow." into...
authorWei Huang <weih@google.com>
Tue, 29 May 2012 20:16:07 +0000 (13:16 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 29 May 2012 20:16:07 +0000 (13:16 -0700)
commitda0ef8ea78cf0ab4b2b769c2148d3f95ed516291
tree7a1638220812ffaf4a7f79b9a7523f8cf85c2f08
parentf3bcd7b173d63cb2d18425602ca514f137625708
parent20582d2f79f82f8a8529753194c863d1593ad08c
am 20582d2f: am f1f02b6e: Merge "Keep screen on for user-initiated slideshow." into jb-dev

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