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