| commit | 947be6bf6700d07e148f6fbf6308e86b08d3c926 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Sun Sep 09 16:11:37 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Sep 09 16:11:37 2012 -0700 |
| tree | a4467af48b00bd2fef9892a657adce4b143e9a6d | |
| parent | b89909df83e55af1726ebc97d1a5ecb4905a91ef [diff] | |
| parent | e7c992c675e0075cd60b0b11c06d5956e3ddd7a3 [diff] |
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.