diff options
| author | Geoff Mendal <mendal@google.com> | 2014-11-24 18:24:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-24 18:24:23 +0000 |
| commit | 44b769d0103df57ccf16f84e037af7d44950aa0a (patch) | |
| tree | 6fe53c2debace3c5e83b182f98bcc21d4840f161 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c9f499d2f1cd598b90bfb8c13e505354555caea8 (diff) | |
| parent | 3a013dab155acafab6a80e6b13a82252b69abd9f (diff) | |
am 3a013dab: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '3a013dab155acafab6a80e6b13a82252b69abd9f':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions