diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-20 16:20:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-20 16:20:59 +0000 |
| commit | df808132d0233e259cae74ff3e9df6407f631321 (patch) | |
| tree | 10e6b2c3de02f82757b1a07b2ab7070d92d0c9a7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7fa4d2a748b94aaddba1a523e671eeea4031ce64 (diff) | |
| parent | 753dc061075c3cd73af1bad508355c132944c694 (diff) | |
am 753dc061: (-s ours) am 34c7ef5d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '753dc061075c3cd73af1bad508355c132944c694':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions