tree e86fd5cf30a9e6c76b2ca5705a8a8561a2332fcf
parent 004eb5c1be854c00e717a8727417a26bb362d7ea
parent 31b375095530c7414305568f3e9ceecfb66ba5bf
author Bryce Lee <brycelee@google.com> 1435699353 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435699353 +0000

am 31b37509: am 5cd293b3: Merge "Merge commit \'91d2cbf4\' into manualmerge" into mnc-dev

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