diff options
| author | Geoff Mendal <mendal@google.com> | 2015-06-15 16:38:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-15 16:38:35 +0000 |
| commit | b00901793e4b6f1bccaa2737972e0aba5129365b (patch) | |
| tree | 8184c0fe7093b35217bb2c8bf428c88d63bfb985 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5cec79470ed469cf32f302d573b635f96c22a098 (diff) | |
| parent | 316548e34476ef75c3ccf8a01366b292927122b6 (diff) | |
am 316548e3: (-s ours) am 40f7418d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '316548e34476ef75c3ccf8a01366b292927122b6':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions