| commit | 51ce74df347eeebfb83441137ac85717791926c0 | [log] [tgz] |
|---|---|---|
| author | Jamie Gennis <jgennis@google.com> | Mon Dec 12 14:12:33 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 12 14:12:33 2011 -0800 |
| tree | 485b152b97bf8321fdd223f35587bb4294672be8 | |
| parent | 65e3a8c9713ca56ed0acc92ee2025e64d8a8d0e6 [diff] | |
| parent | 07584d6321d7235535ed2fba95b444101db5b516 [diff] |
am a1dee3f5: Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1 * commit 'a1dee3f500eccedbf5e50d466315fb28ba812cfc': SurfaceTexture: fix a verbose-log compile error