OSDN Git Service

am 6a6bfe5e: am 6e5063fe: docs: Supported media protocols, codecs, formats for Android TV
authorScott Rowe <scottrowe@google.com>
Fri, 24 Apr 2015 18:21:42 +0000 (18:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 Apr 2015 18:21:42 +0000 (18:21 +0000)
* commit '6a6bfe5e84b598f24d73138523d7f8d88729daed':
  docs: Supported media protocols, codecs, formats for Android TV


Trivial merge