| commit | 4c63a75d56a2c696065cdf17c74921a58a9ea332 | [log] [tgz] |
|---|---|---|
| author | Dave Burke <daveburke@google.com> | Thu Dec 15 19:25:07 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 15 19:25:07 2011 -0800 |
| tree | 485b152b97bf8321fdd223f35587bb4294672be8 | |
| parent | e81ece3465578fdb6401e3d21c8ff1570ae01c9e [diff] | |
| parent | 5e2c24621877d6040b0ddfc320ae098c4b8192ea [diff] |
am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1 * commit 'ac279de9d9fcfd59a336298cfdd5b1f4ab6d038f': SurfaceMediaSource: use the HW_TEXTURE usage bit