diff options
| author | Jonathan Dixon <joth@google.com> | 2014-03-03 21:25:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-03 21:25:21 +0000 |
| commit | e2e7bdea4bd6e6271d08667fedab1cc83ef3cee3 (patch) | |
| tree | 6e1b7bb8af3b3af7313ab8f5efab3ec8c44831e1 /rs/java/android/renderscript/RenderScriptGL.java | |
| parent | df525f67259aec3258e099f32ccd1f929136e418 (diff) | |
| parent | 8553be9b67ae5591f615138d704f25d78a3e2747 (diff) | |
am 8553be9b: (-s ours) am 6ab920fb: am 5b741144: am 3c88a685: am 7c01f9f7: am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master
* commit '8553be9b67ae5591f615138d704f25d78a3e2747':
DO NOT MERGE: Fix build after checkThread fix merge to master
Diffstat (limited to 'rs/java/android/renderscript/RenderScriptGL.java')
0 files changed, 0 insertions, 0 deletions