diff options
| author | Alan Viverette <alanv@google.com> | 2014-03-13 18:08:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-13 18:08:37 +0000 |
| commit | c59474d2813be8df40090ca121f9570977796aa7 (patch) | |
| tree | 9898de3ae883bc6656ab71678add14ee05aa5de7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b287043c3d31e8360ba5c11bd6dafda7288db8a9 (diff) | |
| parent | ba3d0fd5fc520d1a6dcf6e6abc5f9d90c08e9f88 (diff) | |
am ba3d0fd5: am af6288b7: am 3c3377a2: am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev
* commit 'ba3d0fd5fc520d1a6dcf6e6abc5f9d90c08e9f88':
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