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