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