diff options
| author | Baligh Uddin <baligh@google.com> | 2014-08-25 22:07:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-25 22:07:44 +0000 |
| commit | d15d5c8bd4a7208b3d40cefb3c2ed45c6971a5ff (patch) | |
| tree | 13a85ed3fb707002090a3a523d1d6d69bbd50cea /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 63cdabda89dbcfbe9caf76292003ad822c13c5d6 (diff) | |
| parent | d12be991afdaa80a556273e5ad91db2a824002c8 (diff) | |
am d12be991: (-s ours) am 21281ae6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'd12be991afdaa80a556273e5ad91db2a824002c8':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions