diff options
| author | Baligh Uddin <baligh@google.com> | 2014-04-23 02:08:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-23 02:08:07 +0000 |
| commit | e22700ac5bda54aed59193b6f8fad838830ab0aa (patch) | |
| tree | c93fd0ca340ee1bbce39493983d4c2af4d2cc0a5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9ee5df4b126d9f61dd5deeff60e5682d3acfa699 (diff) | |
| parent | 611dd7b70a809ac766e4e1675a4ae1a115cf6cdf (diff) | |
am 611dd7b7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '611dd7b70a809ac766e4e1675a4ae1a115cf6cdf':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions