diff options
| author | Baligh Uddin <baligh@google.com> | 2016-05-22 23:49:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-22 23:49:41 +0000 |
| commit | 339684c2710d1bbe554e6eb48328e2e23b8eb738 (patch) | |
| tree | 56d3ef20aab2fa3ce7b547cfd89fc0ce0e10501f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f381dad9fc221adb00d5a93ef02c5b557da44712 (diff) | |
| parent | 00725f1d65c2db7ee5eda48c5dc683bcfcf885ce (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 83a23d290d -s ours
am: 00725f1d65 -s ours
* commit '00725f1d65c2db7ee5eda48c5dc683bcfcf885ce':
Change-Id: Icea0228b59b0de3234e50b877d9f86f13c1b660d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions