diff options
| author | Geoff Mendal <mendal@google.com> | 2015-02-23 16:41:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-23 16:41:22 +0000 |
| commit | 87809139d223ae1e5629590ba7611b9b1da63cbb (patch) | |
| tree | 28c6862e9549255f59d36f195516f391e01f59fd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 84cd5f64c340067b1a8e3e7a7c7d1e86ca155313 (diff) | |
| parent | 4c58f1271d60554375d85598134fdc821563e78a (diff) | |
am 4c58f127: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '4c58f1271d60554375d85598134fdc821563e78a':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions