diff options
| author | Geoff Mendal <mendal@google.com> | 2015-08-08 14:50:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-08 14:50:10 +0000 |
| commit | 7bb02ffdfc2fee17a6efb6e2a48992484a736284 (patch) | |
| tree | cddf209c4232ed429026e851fe9b9fce5b54ff60 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9bbf7b26b1662f9efc2022b1de82431e8b206f8a (diff) | |
| parent | c61bd18d2b33ba12bedde61002b60086c2b0fd6b (diff) | |
am c61bd18d: (-s ours) am cc92ae98: (-s ours) am 2c997149: (-s ours) am ba4a568c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'c61bd18d2b33ba12bedde61002b60086c2b0fd6b':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions