diff options
author | Baligh Uddin <baligh@google.com> | 2014-04-22 14:49:14 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-22 14:49:14 +0000 |
commit | 94723401bdfaf2d1a5c792654fe18d7f6d21607e (patch) | |
tree | 2e6c0c9fabdf1c35e939af21e439aa94ba6792a9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 97b7208fa436d279b5a7cc4fc582e7ba89181a84 (diff) | |
parent | 04acf38ce281f86bd0f28485405c59e489657dfb (diff) |
am 04acf38c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '04acf38ce281f86bd0f28485405c59e489657dfb':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions