| commit | 490aee0fc5012acf2bf0b1dfe9c09e6fcca606fc | [log] [tgz] |
|---|---|---|
| author | Jamie Gennis <jgennis@google.com> | Fri Aug 24 11:11:06 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Aug 24 11:11:07 2012 -0700 |
| tree | 97fed915e84c3697091a9897fdb459f814071cfd | |
| parent | 9b6a395e65ff88ab79fe92d6f112c434441ca606 [diff] | |
| parent | 9fea3421ffddf6480f57f55a25936a886043d909 [diff] |
Merge "SurfaceTexture: inherit from ConsumerBase (try 2)" into jb-mr1-dev