OSDN Git Service

am 3d402686: Merge "stagefright: use media_codecs_google*.xml files"
authorLajos Molnar <lajos@google.com>
Fri, 21 Mar 2014 21:18:38 +0000 (14:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Mar 2014 21:18:38 +0000 (14:18 -0700)
* commit '3d402686ca4444fea76137208af1fd71bcc8cb21':
  stagefright: use media_codecs_google*.xml files


Trivial merge