diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-11-29 17:26:32 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-29 17:26:32 -0800 |
| commit | c040e1e77923d81050f2d3dbdac5d07e01be72f6 (patch) | |
| tree | e965c66766e6d362eca7e7b4474107740874dc7f /opengl/java/android/opengl/Texture.java | |
| parent | c649180d7c12b0b4bc3c183a6431da26cff74819 (diff) | |
| parent | 6f1dd757cb158d17c76baeb170f7db2271802ef8 (diff) | |
am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
* commit '6f1dd757cb158d17c76baeb170f7db2271802ef8':
SurfaceMediaSource: use the vid enc usage bit
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions