OSDN Git Service

am d25be0ea: (-s ours) DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiP...
authorLajos Molnar <lajos@google.com>
Fri, 6 Feb 2015 20:14:55 +0000 (20:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Feb 2015 20:14:55 +0000 (20:14 +0000)
* commit 'd25be0ea48c775e4038163b546c9553e294d4fdc':
  DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar


Trivial merge