OSDN Git Service

am b5f7b187: am 161c6971: Merge "core_base.mk: switch to new H264 and MPEG2 software...
authorLajos Molnar <lajos@google.com>
Thu, 16 Apr 2015 15:24:42 +0000 (15:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Apr 2015 15:24:42 +0000 (15:24 +0000)
* commit 'b5f7b18749a490a61eac66572ab1a009c608468b':
  core_base.mk: switch to new H264 and MPEG2 software codecs


Trivial merge