diff options
| author | Geoff Mendal <mendal@google.com> | 2014-11-10 15:13:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-10 15:13:25 +0000 |
| commit | 62b7d5e04c19ef1baff30f2a46e4a5edeff160b3 (patch) | |
| tree | b52481d8dca81326c9993a7f89127ab9837d87bd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | cda982bc16aeeb220308a2658f1c55a04072324f (diff) | |
| parent | a68e318834b3486c0426689df4df686dd297a5dc (diff) | |
am a68e3188: (-s ours) am d4c590f4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit 'a68e318834b3486c0426689df4df686dd297a5dc':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions