diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-08 17:51:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-08 17:51:22 +0000 |
| commit | f5e7273796ca1a7e5f3cbe9975197aea15feda1a (patch) | |
| tree | e9563e7483a4a43e6f33e97a7adc055d32e7d2e7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0ea996cfe257785dfcb65724fcb270361f1e8ea0 (diff) | |
| parent | c8da7d5366ee92a81d92d7e5c18fd769a1961032 (diff) | |
am c8da7d53: (-s ours) am 3c573bc5: (-s ours) am 4f5630e5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'c8da7d5366ee92a81d92d7e5c18fd769a1961032':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions