OSDN Git Service

am e7c992c6: am 5abc91d6: Merge "Fix libmedia and libstagefright to get expat header...
authorElliott Hughes <enh@google.com>
Sun, 9 Sep 2012 23:11:37 +0000 (16:11 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 9 Sep 2012 23:11:37 +0000 (16:11 -0700)
commit947be6bf6700d07e148f6fbf6308e86b08d3c926
treea4467af48b00bd2fef9892a657adce4b143e9a6d
parentb89909df83e55af1726ebc97d1a5ecb4905a91ef
parente7c992c675e0075cd60b0b11c06d5956e3ddd7a3
am e7c992c6: am 5abc91d6: Merge "Fix libmedia and libstagefright to get expat header files from the approved location."

* commit 'e7c992c675e0075cd60b0b11c06d5956e3ddd7a3':
  Fix libmedia and libstagefright to get expat header files from the approved location.
media/libmedia/Android.mk
media/libstagefright/Android.mk