| commit | 477fa012865c3c59ebc2dd834c53c7ee33fe3a95 | [log] [tgz] |
|---|---|---|
| author | Bryce Lee <brycelee@google.com> | Thu Oct 23 07:55:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 07:55:21 2014 +0000 |
| tree | b3f45fe444db2ebf5fc52ba544de4b5b5cceb4e6 | |
| parent | dc546ab7c3b53012908ce6b594f34a5d27de78e1 [diff] | |
| parent | 49cb52e296c48613c2177bfcb14fc67e21b9ae03 [diff] |
am 49cb52e2: Merge "resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev" into lmp-mr1-dev * commit '49cb52e296c48613c2177bfcb14fc67e21b9ae03': [Theater Mode] framework implementation through global setting