diff options
author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-12-08 17:32:08 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-08 17:32:12 +0000 |
commit | f65de749016d63b4782698dadb4a72f495a3a636 (patch) | |
tree | b433d1c18a264fd5bd574f2d008797993077738d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 0d31f6d6694d6155c96b3dbf1dce49854c9cc810 (diff) | |
parent | 4f294c5d909a6fb78e4b8291a6df1ce93788dbde (diff) |
Merge "Import translations. DO NOT MERGE am: c30efc0214 -s ours am: a40b64efdd -s ours" into nyc-mr2-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions