diff options
| author | Geoff Mendal <mendal@google.com> | 2015-02-12 23:22:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-12 23:22:38 +0000 |
| commit | f6ee5dbc5efc90467dd46c5317807676fdaf8ae6 (patch) | |
| tree | 52e9edfa13b55ca5cecef2229941cc72dae7badb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1be4b702f531363903b46a88fc3d1603fb19c3ef (diff) | |
| parent | fabfcfd97e37b1cc194fa0e9f6db3268e1a2ae43 (diff) | |
am fabfcfd9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit 'fabfcfd97e37b1cc194fa0e9f6db3268e1a2ae43':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions