commit | 8d7f34a1e011e8cb770f73dead14007504c07d0a | [log] [tgz] |
---|---|---|
author | Scott Rowe <scottrowe@google.com> | Tue Apr 28 14:50:41 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 28 14:50:41 2015 +0000 |
tree | ae4e1c14c086e6c5968a35c117f0eb8ce101a377 | |
parent | dd34c572b508871823df83110bef551ef4b8dfd2 [diff] | |
parent | 5c4eb38053c029f67de1e069cf42883e0e17e236 [diff] |
am 5c4eb380: am cc637ab0: am 7f2e8cdc: am 63604283: am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs * commit '5c4eb38053c029f67de1e069cf42883e0e17e236':