tree f9ef46798f267cef789164862978bd2ae9c32df8
parent 64882b50f849e04ed39bd62120de6637d8664af7
parent ec1c2c0fea5b82ecf480d32dd3679f8437f720eb
author Lajos Molnar <lajos@google.com> 1429199156 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429199156 +0000

am ec1c2c0f: am b5f7b187: am 161c6971: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"

* commit 'ec1c2c0fea5b82ecf480d32dd3679f8437f720eb':
  core_base.mk: switch to new H264 and MPEG2 software codecs