OSDN Git Service

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


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