diff options
| author | Baligh Uddin <baligh@google.com> | 2014-09-29 20:48:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-29 20:48:48 +0000 |
| commit | 7e40778bae0c58173116fb7e6d250abfdb9b5250 (patch) | |
| tree | f3f90285d503a02b3f347f0c461738020c033152 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 49b3a054d1544f8fefc4ff01c7a4a70ba32aef54 (diff) | |
| parent | 37960312646de29b3271d9bc0d6a07cf4bbd942f (diff) | |
am 37960312: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '37960312646de29b3271d9bc0d6a07cf4bbd942f':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions