| commit | c8bb597fba16589b9d76959bae22da22d00967d4 | [log] [tgz] |
|---|---|---|
| author | Anthony Hugh <ahugh@google.com> | Mon Mar 23 20:28:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 23 20:28:35 2015 +0000 |
| tree | dbe5ff5d6bc48ec29d607304be3bb3675504deae | |
| parent | 722612707e7eef745dab573ff226e2bd904295cb [diff] | |
| parent | 09ebc52a851d3432087a622a9372a071a1c0c761 [diff] |
am 09ebc52a: am 7c08dd61: Merge "DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier" into lmp-mr1-modular-dev * commit '09ebc52a851d3432087a622a9372a071a1c0c761': DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier