diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-12-12 16:10:28 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-12 16:10:28 -0800 |
| commit | f08403ba92999448512c4af7062fe30206e32dcf (patch) | |
| tree | cd3a6d1c8e3ecd4cb2378a75b87ae79ec12bc17a /graphics/java/android/renderscript/Program.java | |
| 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
Diffstat (limited to 'graphics/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions