diff options
author | Baligh Uddin <baligh@google.com> | 2013-11-05 08:00:26 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-05 08:00:26 -0800 |
commit | 63c0e12ba03e6aba207cf006d2a883343553b399 (patch) | |
tree | 858179056dcb0d807d989cc404b79109db91d542 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 13b204f82b098e06c7f13a1c67bec702c63c1a28 (diff) | |
parent | 41c3cb387aba237a42ace7eb17ee7a926fcfdec7 (diff) |
am 41c3cb38: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '41c3cb387aba237a42ace7eb17ee7a926fcfdec7':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions