diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-22 14:19:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-22 14:19:11 +0000 |
| commit | 1ac9628c97a04dacfaaf4ebe5dbcfd6599b0405f (patch) | |
| tree | 8a9b9526a498f0170bfe70986bf3e4e524ba46df /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5cae0cded77f412d738bfdc2e58036c8e9422135 (diff) | |
| parent | 8d5ed661f060e3d915f3f1f593f2f87ebd1285cc (diff) | |
am 8d5ed661: (-s ours) am 920e8be6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '8d5ed661f060e3d915f3f1f593f2f87ebd1285cc':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions