| commit | 1d9184035d5d74c850d688cd269e97ea3f77953e | [log] [tgz] |
|---|---|---|
| author | Bryce Lee <brycelee@google.com> | Thu Oct 23 08:01:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 08:01:57 2014 +0000 |
| tree | 5142b63c0cc742e152cf7de1224de017c4649575 | |
| parent | 1338a8bd80d4a19c64066a18f9e58fc7456420b6 [diff] | |
| parent | 477fa012865c3c59ebc2dd834c53c7ee33fe3a95 [diff] |
am 477fa012: am 49cb52e2: Merge "resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev" into lmp-mr1-dev * commit '477fa012865c3c59ebc2dd834c53c7ee33fe3a95': [Theater Mode] framework implementation through global setting