diff options
| author | Baligh Uddin <baligh@google.com> | 2014-05-22 03:16:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-22 03:16:57 +0000 |
| commit | 3df799a048b9a88890c4072bb7a7a4469374fc06 (patch) | |
| tree | b51ce37457ea5b5eae1fd57f33c6a0375ad4fe63 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0ddf4db856442b1af05f2c58d070a379d7b51242 (diff) | |
| parent | b8cc0ed838c8cf303f1e8063db865651627093da (diff) | |
am b8cc0ed8: (-s ours) am 675b4871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'b8cc0ed838c8cf303f1e8063db865651627093da':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions