From: Lajos Molnar <lajos@google.com>
Date: Thu, 16 Apr 2015 15:24:42 +0000 (+0000)
Subject: am b5f7b187: am 161c6971: Merge "core_base.mk: switch to new H264 and MPEG2 software... 
X-Git-Tag: android-x86-6.0-r1~144^2~70
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ec1c2c0f;p=android-x86%2Fbuild.git

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

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

ec1c2c0fea5b82ecf480d32dd3679f8437f720eb