diff options
author | Baligh Uddin <baligh@google.com> | 2014-04-23 02:07:48 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-23 02:07:48 +0000 |
commit | b491f8323893fb751a1b1291ec3f66cdb73ed8c2 (patch) | |
tree | c93fd0ca340ee1bbce39493983d4c2af4d2cc0a5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 61f9ac26fdc1f044c8a5b1541babcffe88ba548b (diff) | |
parent | 42c0488a4b4db802161dc60a0bd16d2e5bc6afbe (diff) |
am 42c0488a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '42c0488a4b4db802161dc60a0bd16d2e5bc6afbe':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions