diff options
author | Scott Main <smain@google.com> | 2012-10-04 11:50:18 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-04 11:50:18 -0700 |
commit | c3b8a9b6d03283c77d179e1f6293a6319c91e6e6 (patch) | |
tree | a4a8bde5c58c850571c470b9a2a8879a161a729f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 70e6cff9bcd464fcb22a0d7dc977863ef0952448 (diff) | |
parent | bc7a20a48c3e8405c8dbbf54dd8f422fa5e19e3a (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