OSDN Git Service

am 53aad5e7: am 3454f123: media: add kMetadataBufferTypeGraphicBuffer
authorLajos Molnar <lajos@google.com>
Tue, 14 Oct 2014 22:24:22 +0000 (22:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Oct 2014 22:24:22 +0000 (22:24 +0000)
* commit '53aad5e7de7619cbc9b0d9a0a0830fc29c331f8d':
  media: add kMetadataBufferTypeGraphicBuffer


Trivial merge