OSDN Git Service

am 51cf3661: am f38b5287: Merge "MediaFormat: Explain that KEY_COLOR_FORMAT is used...
authorMarco Nelissen <marcone@google.com>
Tue, 30 Jul 2013 17:28:38 +0000 (10:28 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 30 Jul 2013 17:28:38 +0000 (10:28 -0700)
commit4d4a137bf5f861bce744c113744718066e1f214e
treebb20decb11ec6c1ab5df5b548234103a40d42051
parente7c9482015cafbd01bfa513e60f7ab45b48ce495
parent51cf3661fa658d7cec6a08ed3f916ce98203027c
am 51cf3661: am f38b5287: Merge "MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well"

* commit '51cf3661fa658d7cec6a08ed3f916ce98203027c':
  MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well