tree 6cfb33a0ce7ac51dd6299e3099ae2785cfe79d09
parent eb7f1a948a202cec51c0c09c3fbc1c557674380b
parent cc2ba2200ddc9d95753fa930aa245540fac880e8
author Bryce Lee <brycelee@google.com> 1435689287 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435689287 +0000

am cc2ba220: Merge "Only enable theater mode by button press after setup." into cw-d-mr1-dev

* commit 'cc2ba2200ddc9d95753fa930aa245540fac880e8':
  Only enable theater mode by button press after setup.