diff options
| author | Geoff Mendal <mendal@google.com> | 2015-08-03 14:29:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-03 14:29:04 +0000 |
| commit | 189d4c2d8c53155770e4b95390380b479d8494b9 (patch) | |
| tree | 5f4f3bec1506d44059d662110c327ab04a46a0f2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 18eebf52ea342540e224da10c6b255ff8c2ea216 (diff) | |
| parent | d9bfd3b7c316591d6daa8a2984a42a552fafd48b (diff) | |
am d9bfd3b7: (-s ours) am b2befd5d: (-s ours) am 9d3ae041: (-s ours) am 32caf077: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'd9bfd3b7c316591d6daa8a2984a42a552fafd48b':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions