diff options
| author | Bill Yi <byi@google.com> | 2016-11-02 13:16:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-02 13:16:30 +0000 |
| commit | f38a9f357a4689cfe206d71c7fdc8f3c8ed64340 (patch) | |
| tree | 5e8fcd1ff29aa07917c6f8cb65bab90e804cba58 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 12bc7f28ad8bc71321ac00fba0c66c1b44cbe1b9 (diff) | |
| parent | 77323eb2bd30b5cef7cb7ef534034515fd503764 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 125deebf5d -s ours am: 3b99360472 -s ours
am: 77323eb2bd -s ours
Change-Id: Ib7e45076dda50cf23ee25743605480c58682af43
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions