diff options
| author | Bill Yi <byi@google.com> | 2016-11-05 06:28:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-05 06:28:33 +0000 |
| commit | e8dff1a5bdf0cd0689d3c7c13301562a850d700d (patch) | |
| tree | 8645d9abdcc6e7fb5d276618b03ec087b380ca15 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 77b50cef75f348123dd4275362392c434f088cab (diff) | |
| parent | dfe18334756065bf9141d7f706fedfa89cdafd25 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: dfe1833475 -s ours
Change-Id: I1a6ca6a0a9dc9b4ee03bc6413ea0048118b9777c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions