diff options
| author | Baligh Uddin <baligh@google.com> | 2013-10-11 08:16:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-11 08:16:10 -0700 |
| commit | ce76c4341b34e4122c72435aa1e3123b94e83045 (patch) | |
| tree | 138ab9bd3eba468defaddcc1bbdeac97b8238ec6 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 01c34ac6f5b1b91bd2b7a8ad61660d4e9002251b (diff) | |
| parent | 9aa75f29a6259f8c65a5e1ad507f71ea3b419d47 (diff) | |
am 9aa75f29: (-s ours) am ccfd6f44: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '9aa75f29a6259f8c65a5e1ad507f71ea3b419d47':
Import translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions