| commit | f08403ba92999448512c4af7062fe30206e32dcf | [log] [tgz] |
|---|---|---|
| author | Jamie Gennis <jgennis@google.com> | Mon Dec 12 16:10:28 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 12 16:10:28 2011 -0800 |
| tree | cd3a6d1c8e3ecd4cb2378a75b87ae79ec12bc17a | |
| parent | b2bf2471b1f0b4a76660e63f91a8de84cc643da8 [diff] | |
| parent | 74e0fcaed1cd20ae8632224ff5a5404ff1a6e497 [diff] |
am 74e0fcae: am a1dee3f5: Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1 * commit '74e0fcaed1cd20ae8632224ff5a5404ff1a6e497': SurfaceTexture: fix a verbose-log compile error