diff options
| author | Baligh Uddin <baligh@google.com> | 2014-12-03 00:30:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-03 00:30:22 +0000 |
| commit | 68ccc097e97f8564b359cf76ae680f2ef14f6d3b (patch) | |
| tree | 1b501424ea3228ec785ee53fa5c74db2b4f9623a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7ef3d1283280eaf5fb2681a800dadf266f8c94a8 (diff) | |
| parent | e105a70ae1dcfdbca15e188f27d7d3a1bea788d2 (diff) | |
am e105a70a: (-s ours) am 261db4f3: (-s ours) am 30460ae3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'e105a70ae1dcfdbca15e188f27d7d3a1bea788d2':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions