| commit | cc637ab0345759040daba736d3b1bf0687d88296 | [log] [tgz] |
|---|---|---|
| author | Scott Rowe <scottrowe@google.com> | Mon Apr 27 17:48:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 27 17:48:38 2015 +0000 |
| tree | 628b0d8bdbdbbe955ef4843fa60438bd6c292511 | |
| parent | b005be690be4a5851591d35ca2ea07de14176624 [diff] | |
| parent | 7f2e8cdc521d3f47ce5e22e8589569dd486c1aa8 [diff] |
am 7f2e8cdc: am 63604283: am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs * commit '7f2e8cdc521d3f47ce5e22e8589569dd486c1aa8':