| commit | df96385b9acf9ec74c62edc34ffa9c8d9dae1c03 | [log] [tgz] |
|---|---|---|
| author | Jamie Gennis <jgennis@google.com> | Wed Nov 30 10:50:49 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 30 10:50:49 2011 -0800 |
| tree | 156e5102fa53ad3debbe864bc1780925d693fa71 | |
| parent | 267a4b0627f98b020725e860b0a3c128067131b1 [diff] | |
| parent | c040e1e77923d81050f2d3dbdac5d07e01be72f6 [diff] |
am c040e1e7: am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1 * commit 'c040e1e77923d81050f2d3dbdac5d07e01be72f6': SurfaceMediaSource: use the vid enc usage bit