| commit | 51cf3661fa658d7cec6a08ed3f916ce98203027c | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Tue Jul 30 10:17:08 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 30 10:17:08 2013 -0700 |
| tree | 189b986b05ce5df692f593eec41e68cd93ad2a73 | |
| parent | cc4bee55fa58193073f5ba5ccebc0cc24fdb45c7 [diff] | |
| parent | f38b528701fd9bfd06adb2c9aeb7d5f951647312 [diff] |
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