diff options
| author | Geoff Mendal <mendal@google.com> | 2014-12-04 15:16:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-04 15:16:21 +0000 |
| commit | c7d8a48bb01f3d6ffbf6a3f8f81e23dd0b806562 (patch) | |
| tree | 3c21408034e9bffdea00cde683c1b09be9a7831d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c7b52575212ca00f7c52222f1129a0f64e061095 (diff) | |
| parent | cc7c68b54801e07107d6e212ae50a375d730e000 (diff) | |
am cc7c68b5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'cc7c68b54801e07107d6e212ae50a375d730e000':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions