OSDN Git Service

am 5c7792dd: am 254ee387: am aef3698f: Merge "resolved conflicts for merge of 91d2cbf...
authorBryce Lee <brycelee@google.com>
Wed, 24 Jun 2015 00:40:37 +0000 (00:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 24 Jun 2015 00:40:37 +0000 (00:40 +0000)
commit56c47e9fd044442b2652e1d695d1fca779176509
tree7fa52e52701a3cf32fffb151db2086516461b75e
parente9b4972d24dc7ad189009287902a72b21cbc827c
parent5c7792dd903bee89a59d67c4da975b9fe7f37a8a
am 5c7792dd: am 254ee387: am aef3698f: Merge "resolved conflicts for merge of 91d2cbf4 to mnc-dev" into mnc-dev

* commit '5c7792dd903bee89a59d67c4da975b9fe7f37a8a':
  Turn off theater mode upon power button press.