OSDN Git Service

am f38b5287: Merge "MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders...
authorMarco Nelissen <marcone@google.com>
Tue, 30 Jul 2013 17:17:08 +0000 (10:17 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 30 Jul 2013 17:17:08 +0000 (10:17 -0700)
commit51cf3661fa658d7cec6a08ed3f916ce98203027c
tree189b986b05ce5df692f593eec41e68cd93ad2a73
parentcc4bee55fa58193073f5ba5ccebc0cc24fdb45c7
parentf38b528701fd9bfd06adb2c9aeb7d5f951647312
am f38b5287: Merge "MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well"

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