OSDN Git Service

am 8cd7e944: am fb102b1b: am 7c794b16: Merge "Revert "core_base.mk: switch to new...
authorLajos Molnar <lajos@google.com>
Thu, 16 Apr 2015 16:40:35 +0000 (16:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Apr 2015 16:40:35 +0000 (16:40 +0000)
* commit '8cd7e9442cfbd8247bb99c312f6e98649b3afe42':
  Revert "core_base.mk: switch to new H264 and MPEG2 software codecs"


Trivial merge