diff options
| author | Geoff Mendal <mendal@google.com> | 2014-11-10 17:22:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-10 17:22:10 +0000 |
| commit | 1102d9af48fdcc6e3dfa381d06e978a917b2b4a0 (patch) | |
| tree | 3f51166d93562ba674fc682f238bc1e94becec26 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 46524961fa660fe757f952e431e5e92e74f5b69f (diff) | |
| parent | 5b114e85ea46691629b16483d8519982a332b8fb (diff) | |
am 5b114e85: (-s ours) am 30a7f56c: (-s ours) am 7d447f73: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '5b114e85ea46691629b16483d8519982a332b8fb':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions