diff options
| author | Baligh Uddin <baligh@google.com> | 2014-09-29 21:02:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-29 21:02:34 +0000 |
| commit | e037c0b1ad9bb82fd069bd09fe9582864d922466 (patch) | |
| tree | eaa113bd4bb5f52de29ff0349a1d371170af57ab /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 88539d1b298052e0b14c4fb815e208186c861159 (diff) | |
| parent | 49b3a054d1544f8fefc4ff01c7a4a70ba32aef54 (diff) | |
am 49b3a054: (-s ours) am c570fff1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '49b3a054d1544f8fefc4ff01c7a4a70ba32aef54':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions