diff options
| author | Geoff Mendal <mendal@google.com> | 2014-11-10 17:41:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-10 17:41:47 +0000 |
| commit | af0d3eb64ebffe3629187df6de3060e284b2575a (patch) | |
| tree | 51786c0ff54287e17df9b3bd1c15857b9768b2d9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 357175a3bad23ee590ca45534607c2b73a00b19a (diff) | |
| parent | ccfbd1bacc3c0ab5525b2cfd695ad225468a338e (diff) | |
am ccfbd1ba: (-s ours) am 20083734: (-s ours) am 8f02ec4f: (-s ours) am d53436a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit 'ccfbd1bacc3c0ab5525b2cfd695ad225468a338e':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions