commit | 5c4eb38053c029f67de1e069cf42883e0e17e236 | [log] [tgz] |
---|---|---|
author | Scott Rowe <scottrowe@google.com> | Mon Apr 27 18:30:01 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 27 18:30:01 2015 +0000 |
tree | bd1cab4d1e6ea5a27cff71afde94c602ad437236 | |
parent | 5ba6a76884f8cfefc5b40553c78cf94a7003f11f [diff] | |
parent | cc637ab0345759040daba736d3b1bf0687d88296 [diff] |
am cc637ab0: am 7f2e8cdc: am 63604283: am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs * commit 'cc637ab0345759040daba736d3b1bf0687d88296':