diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-22 16:09:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-22 16:09:47 +0000 |
| commit | 5c080bd2fb2d99724e1c0cec11fc1fe9d1cad597 (patch) | |
| tree | 417ef4cd00d18b4e02b8d1a7c556021d37a670dc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8d5ed661f060e3d915f3f1f593f2f87ebd1285cc (diff) | |
| parent | c41e3191654d1b1e9df641da6aa7a8bf4f64b975 (diff) | |
am c41e3191: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'c41e3191654d1b1e9df641da6aa7a8bf4f64b975':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions