diff options
| author | Bill Yi <byi@google.com> | 2016-09-01 18:38:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-01 18:38:45 +0000 |
| commit | 347f2b60b5f4fcc10596e704f1a7b2cb851223a3 (patch) | |
| tree | e3d3e63dd434688a740298ddaeccc92c777635f9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 05af4b26b6551d1625fcb8d3be9841d2bd1796f4 (diff) | |
| parent | 57bd22ffc136b68f0ae0944079fc1316f3b6f96c (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 57bd22ffc1 -s ours
Change-Id: If22150c06b3d31d90e77b65f4c76ad1c4d56b797
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions