diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-13 16:01:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 16:01:47 +0000 |
| commit | 89d478c2c94577a700bee42be70852fda17fa733 (patch) | |
| tree | 933afff8eeb2b66569e41799e504e413ed0e0f11 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7691b99c0dd5758b83e12b8101ce77e2f62769eb (diff) | |
| parent | 0310775154f533d1b6b156ceabe610bd4c249d25 (diff) | |
am 03107751: (-s ours) am 9cee0e77: (-s ours) am ce5c1ac8: (-s ours) am f841432e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '0310775154f533d1b6b156ceabe610bd4c249d25':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions