| commit | b25c225c28b527c04635d7d1aa91b06b4d74c2c8 | [log] [tgz] |
|---|---|---|
| author | Jinsuk Kim <jinsukkim@google.com> | Fri Oct 10 23:04:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 10 23:04:43 2014 +0000 |
| tree | 3f9ff8ffdc66385a73d7fd0b647804910a89eb36 | |
| parent | 5457d5ccb6efdc138523cbcba7aa76ddb67f19e4 [diff] | |
| parent | 0878e8c9d1b71f350a8513d373e6f8e74129624a [diff] |
am 0878e8c9: am 62ba538b: resolved conflicts for merge of 3170c035 to lmp-mr1-dev * commit '0878e8c9d1b71f350a8513d373e6f8e74129624a': CEC: Prevents HdmiControlService from turning on TV on wakeup