| commit | 254ee38778a865dd55aa065f6c0937b2ca969caa | [log] [tgz] |
|---|---|---|
| author | Bryce Lee <brycelee@google.com> | Wed Jun 24 00:12:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 24 00:12:29 2015 +0000 |
| tree | 58c7589a75cf6a0d13bb0e0f2b173c07485f6c34 | |
| parent | 423c824b5084b42391a85ce990338b0ed7b3ca1b [diff] | |
| parent | aef3698f9a80626fc8dc8be5e4d1359cafcc17d2 [diff] |
am aef3698f: Merge "resolved conflicts for merge of 91d2cbf4 to mnc-dev" into mnc-dev * commit 'aef3698f9a80626fc8dc8be5e4d1359cafcc17d2': Turn off theater mode upon power button press.