diff options
author | Baligh Uddin <baligh@google.com> | 2014-04-16 15:31:02 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-16 15:31:02 +0000 |
commit | e65c292a5e7f4d70a43f965909647f89bb46809d (patch) | |
tree | ae95009e8cc935c2150eeb65b04ed71e5c2707e8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | da34482dfc879e741f1ab2f64a0c1741640186da (diff) | |
parent | f104f676e375c5c53eb049705740ab592b914bda (diff) |
am f104f676: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'f104f676e375c5c53eb049705740ab592b914bda':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions