| commit | e2eb9127587cd19d8eaa9a1613d0e4548a5c7372 | [log] [tgz] |
|---|---|---|
| author | Dave Burke <daveburke@google.com> | Thu Dec 15 19:27:17 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 15 19:27:17 2011 -0800 |
| tree | 76a85ebc08e2538fb6a27cea972455efcc38a856 | |
| parent | d1d6e210bfa4e35250b61bb4c9807cd5d5d66fb9 [diff] | |
| parent | 4c63a75d56a2c696065cdf17c74921a58a9ea332 [diff] |
am 0cc1e42d: am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1 * commit '0cc1e42d74e09c259a6da0abc9009d1abf7537b1': SurfaceMediaSource: use the HW_TEXTURE usage bit