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

* commit '5cd293b37946ccc60c148e4a17e5f59620999046':
  Only enable theater mode by button press after setup.
tree: 73901e71a3ddfcf186e51b16c22d160c13f46f57
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. wrap_alpha.py