| commit | 7e2f99569ae7d22307957abecc2e1818b4e7ab5e | [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 | c5f62a947aa04afb4e3f5f8f8ddbb569ff8fa0c0 | |
| parent | 3453bf678e3d0187015cdde1c9263299ea361726 [diff] | |
| parent | 69aac3e6cd68e8c305a41b2677123db7662efd4b [diff] |
am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1 * commit 'ac279de9d9fcfd59a336298cfdd5b1f4ab6d038f': SurfaceMediaSource: use the HW_TEXTURE usage bit