diff options
author | Mathias Agopian <mathias@google.com> | 2011-06-16 12:39:48 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-16 12:39:48 -0700 |
commit | 21bd76157ea970237f628f88f01351bc1d063f74 (patch) | |
tree | 8c7071fee93514f53d5873b2e744f278bd0e1e03 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | b6a6d595475edfac10988360f1a5ebba77c018b8 (diff) | |
parent | 85c14352a4f8946a6908eac140936080536fa575 (diff) |
am 85c14352: (-s ours) am 7ecdeb6e: am d20d72d1: Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2
* commit '85c14352a4f8946a6908eac140936080536fa575':
revert surfaceflinger leak fix as it uncovered a crasher on xoom
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions