diff options
| author | Baligh Uddin <baligh@google.com> | 2014-08-22 18:36:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-22 18:36:24 +0000 |
| commit | 7fbc5ae88515362f41ff382d8e614e1225787183 (patch) | |
| tree | 3a4805a28afafa201f3010487b49fa29ec5a6cd2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d12be991afdaa80a556273e5ad91db2a824002c8 (diff) | |
| parent | 2be95a8bcf28fafff69c8e036c5ba5eb3f1884bd (diff) | |
am 2be95a8b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '2be95a8bcf28fafff69c8e036c5ba5eb3f1884bd':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions