OSDN Git Service

am 254ee387: am aef3698f: Merge "resolved conflicts for merge of 91d2cbf4 to mnc...
authorBryce Lee <brycelee@google.com>
Wed, 24 Jun 2015 00:26:20 +0000 (00:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 24 Jun 2015 00:26:20 +0000 (00:26 +0000)
commit5c7792dd903bee89a59d67c4da975b9fe7f37a8a
treee67a07f55a37e420bd13ec218b0badb2fb67c239
parenta4e38b9d86c59e033f0d17ee7ac96734133881ac
parent254ee38778a865dd55aa065f6c0937b2ca969caa
am 254ee387: am aef3698f: Merge "resolved conflicts for merge of 91d2cbf4 to mnc-dev" into mnc-dev

* commit '254ee38778a865dd55aa065f6c0937b2ca969caa':
  Turn off theater mode upon power button press.