diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-13 16:01:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 16:01:54 +0000 |
| commit | cd0d0115b67ff2f3bb5efcf34812596e81e1eded (patch) | |
| tree | 933afff8eeb2b66569e41799e504e413ed0e0f11 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 89d478c2c94577a700bee42be70852fda17fa733 (diff) | |
| parent | 3772e27cb6ec797a1b79f5f93bbd6b72163d3671 (diff) | |
am 3772e27c: (-s ours) am 5e73ac02: (-s ours) am 305cf0f8: (-s ours) am 4d64bdbc: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '3772e27cb6ec797a1b79f5f93bbd6b72163d3671':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions