diff options
author | Bill Yi <byi@google.com> | 2017-05-18 23:59:17 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-18 23:59:17 +0000 |
commit | ea87948cf9136c1737514c5f9c7761187282b348 (patch) | |
tree | 382c5e23635ec9268c788aba23ef83d3fd9c14e5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | f332b5dfc8120a9cb85b63cbe4a72b72fa8d3fa5 (diff) | |
parent | d4c3c6e1b18fd9e39eb74baeac2fd4ab5001cb00 (diff) |
Merge "Import translations. DO NOT MERGE" into oc-dev
am: d4c3c6e1b1 -s ours
Change-Id: I3d2ad4363209ff05fc2dd5f50f0173ff6c748902
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions