OSDN Git Service

am 45fa6771: Merge "Improve screen on/off logic in slideshow." into ics-mr1
authorDaniel Sandler <dsandler@android.com>
Wed, 30 Nov 2011 18:50:55 +0000 (10:50 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Nov 2011 18:50:55 +0000 (10:50 -0800)
* commit '45fa677140112f725df3765be56edc715c226aa5':
  Improve screen on/off logic in slideshow.


Trivial merge