diff options
| author | Geoff Mendal <mendal@google.com> | 2015-06-15 14:17:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-15 14:17:40 +0000 |
| commit | b736c65ab194ed9b381fc37dfc00c9b7635e8c2c (patch) | |
| tree | d40302ac3660b0c70cad2067b0364375deb42536 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f5c84d5ca33c8f24ab5ae870229b0d4bf7ff4340 (diff) | |
| parent | ea1807aa9d6829e4b8c07b82a349d1f15d37a503 (diff) | |
am ea1807aa: (-s ours) am 991f0f65: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'ea1807aa9d6829e4b8c07b82a349d1f15d37a503':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions