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