diff options
| author | Alan Viverette <alanv@google.com> | 2014-03-13 18:02:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-13 18:02:11 +0000 |
| commit | ba3d0fd5fc520d1a6dcf6e6abc5f9d90c08e9f88 (patch) | |
| tree | 9ff3de1094430ca35648fc2a1e698f575a2e5c48 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4a5c9e941a78299d869b4c9d916fd86187057150 (diff) | |
| parent | af6288b721110ffc4b4e68d55398b5ca31fc32e8 (diff) | |
am af6288b7: am 3c3377a2: am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev
* commit 'af6288b721110ffc4b4e68d55398b5ca31fc32e8':
DO NOT MERGE Ensure transient state views are temporarily detached
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions