OSDN Git Service

am 1e7688b0: am 3d402686: Merge "stagefright: use media_codecs_google*.xml files"
authorLajos Molnar <lajos@google.com>
Mon, 12 May 2014 23:29:00 +0000 (23:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:29:00 +0000 (23:29 +0000)
* commit '1e7688b0b4b990aa337c68197ca0c5596d57c059':


Trivial merge