summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2012-10-04 11:50:18 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-04 11:50:18 -0700
commitc3b8a9b6d03283c77d179e1f6293a6319c91e6e6 (patch)
treea4a8bde5c58c850571c470b9a2a8879a161a729f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent70e6cff9bcd464fcb22a0d7dc977863ef0952448 (diff)
parentbc7a20a48c3e8405c8dbbf54dd8f422fa5e19e3a (diff)
am bc7a20a4: resolved conflicts for merge of 78866b71 to jb-dev
* commit 'bc7a20a48c3e8405c8dbbf54dd8f422fa5e19e3a': Doc update: TTL change.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions