| commit | ccfedfccbe63af223027471ea80869d0fb011098 | [log] [tgz] |
|---|---|---|
| author | Scott Rowe <scottrowe@google.com> | Fri Apr 24 18:16:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 24 18:16:26 2015 +0000 |
| tree | 2fb3c66c1843cd2bfc00b0f77c25a6a5d71f9757 | |
| parent | b3523d7f8f8274a04145ca34eab9821aafb52d7a [diff] | |
| parent | 5827af11bdcd9973afe04cb035e83c6428d1e562 [diff] |
am 5827af11: am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs * commit '5827af11bdcd9973afe04cb035e83c6428d1e562': docs: Supported media protocols, codecs, formats for Android TV