diff options
author | Baligh Uddin <baligh@google.com> | 2014-09-29 20:48:41 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-29 20:48:41 +0000 |
commit | 49b3a054d1544f8fefc4ff01c7a4a70ba32aef54 (patch) | |
tree | f3f90285d503a02b3f347f0c461738020c033152 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | f94a7f804ccadd60058617b86208d77345184da2 (diff) | |
parent | c570fff11131e4407536e52e1742c0adb72b3b6f (diff) |
am c570fff1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'c570fff11131e4407536e52e1742c0adb72b3b6f':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions