OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc4bee5 f38b528)
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)
* commit 'f38b528701fd9bfd06adb2c9aeb7d5f951647312':
  MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help