tree 4a8bf51b6d1ffbb7ad24bb34d7d1a744de0e1772
parent 4e94e8858fc3187ec0eae83c70698c85115a630e
parent 8e6fd7cee5467824cd96b4127ccc755c70bd4ea3
author Daniel Sandler <dsandler@android.com> 1322619556 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1322619556 -0800

Merge "Improve screen on/off logic in slideshow." into ics-mr1