| commit | 2c7eb92b6394427bfe81962668d46194959bc722 | [log] [tgz] |
|---|---|---|
| author | Jamie Gennis <jgennis@google.com> | Fri Aug 17 15:35:17 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Aug 17 15:35:17 2012 -0700 |
| tree | cb381633384a19a10064536b60a571f8c6fb2076 | |
| parent | cd60f99aba9e750700a967db30b74a29145739cf [diff] | |
| parent | ed059a8d754770c3cf28b78dba30f7a6ba475dbe [diff] |
Merge "SurfaceTexture: inherit from ConsumerBase" into jb-mr1-dev