| commit | 0878e8c9d1b71f350a8513d373e6f8e74129624a | [log] [tgz] |
|---|---|---|
| author | Jinsuk Kim <jinsukkim@google.com> | Fri Oct 10 22:59:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 10 22:59:07 2014 +0000 |
| tree | 612657fda42987793124050f8ed173555074aa41 | |
| parent | 8f6928f1399620ce432b82d046912e2030d6511c [diff] | |
| parent | 62ba538b940ab0f69991fbc949bed513e0548d6e [diff] |
am 62ba538b: resolved conflicts for merge of 3170c035 to lmp-mr1-dev * commit '62ba538b940ab0f69991fbc949bed513e0548d6e': CEC: Prevents HdmiControlService from turning on TV on wakeup