diff options
| author | Alan Viverette <alanv@google.com> | 2014-03-13 10:01:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-13 10:01:30 +0000 |
| commit | af6288b721110ffc4b4e68d55398b5ca31fc32e8 (patch) | |
| tree | 71b2f0e429cb176bb192bb3a2824f0360f84c8bf /rs/java/android/renderscript/RenderScriptGL.java | |
| parent | 68ec033b7c9ea28155bbb007b01d5dbce2239392 (diff) | |
| parent | 3c3377a2290764937548de5a49ca8ec28dc98153 (diff) | |
am 3c3377a2: am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev
* commit '3c3377a2290764937548de5a49ca8ec28dc98153':
DO NOT MERGE Ensure transient state views are temporarily detached
Diffstat (limited to 'rs/java/android/renderscript/RenderScriptGL.java')
0 files changed, 0 insertions, 0 deletions