diff options
| author | Patrick Scott <phanna@android.com> | 2010-01-26 10:27:12 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-26 10:27:12 -0800 |
| commit | 9521e257bc8b0865099bd3312c8edfb9fdb3d261 (patch) | |
| tree | 7de72ca0a27202f44bf3f7e7778d91dabdcdfb6b /graphics/java/android/renderscript/ProgramVertex.java | |
| parent | 7168231a40a97294e1a18e5d0d391b55915059a2 (diff) | |
| parent | 5b7ea0146dcfd5564d894d4cf0104919775feb36 (diff) | |
am 5b7ea014: (-s ours) am e7b2845d: Merge "DO NOT MERGE return an error when Surface::lock() is called while the surface is already locked." into eclair-mr2
Merge commit '5b7ea0146dcfd5564d894d4cf0104919775feb36'
* commit '5b7ea0146dcfd5564d894d4cf0104919775feb36':
DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramVertex.java')
0 files changed, 0 insertions, 0 deletions