commit | fd48021dfc3278b048ba99ecffe7f996751fb440 | [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 | 95df204b201380b95ae273ab9788d81fce8e3f62 | |
parent | 6ce3d19cd35a49add6893298f70b87917fc60d52 [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.