diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-13 15:11:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 15:11:13 +0000 |
| commit | ebaecc0c85523c65adb1517f48ce53b4f8576a64 (patch) | |
| tree | 00150c1f0a37179b532304998dbf8827467018df /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 305cf0f832c773a7c0d02138cea844bb3c5b0010 (diff) | |
| parent | cc9b8ddde7c0d0eb30b326d50c08bb330029545c (diff) | |
am cc9b8ddd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'cc9b8ddde7c0d0eb30b326d50c08bb330029545c':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions