diff options
| author | Geoff Mendal <mendal@google.com> | 2014-11-10 15:03:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-10 15:03:52 +0000 |
| commit | ddfc619dc33f9e82449c8ffa86a01393071f781d (patch) | |
| tree | 64ad57d72e0ad191cef810aa86115a59421d2401 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 995608676ee584548093ff1ed9ec46280a34fd0c (diff) | |
| parent | 1ac3d5bf47d57da9f4d146b5378e56b81177e5cd (diff) | |
am 1ac3d5bf: (-s ours) am 06b0fb54: (-s ours) am 70eb9f64: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '1ac3d5bf47d57da9f4d146b5378e56b81177e5cd':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions