diff options
| author | Baligh Uddin <baligh@google.com> | 2014-03-20 19:13:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 19:13:02 +0000 |
| commit | 5c43c35790663442935c901730b5a4403311f254 (patch) | |
| tree | e21667ad05e347e3aa04ea6cd3c0245a26731d23 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a3633c25033b576ae160ea86194e4f7f20d82fe2 (diff) | |
| parent | c2221b93b983638d58fe80c88ed81ff67e25a74b (diff) | |
am c2221b93: (-s ours) am ecf3c574: (-s ours) am 826f3647: (-s ours) am d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'c2221b93b983638d58fe80c88ed81ff67e25a74b':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions