diff options
| author | Bill Yi <byi@google.com> | 2016-11-01 08:01:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-01 08:01:34 +0000 |
| commit | 37fe00504a57b40f55f5f76b9dc69866645d58be (patch) | |
| tree | 45e1c63a6c6b31dcb13a52ca23b6cccb161301a5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 645f53f8a19f11cf4ee5f167baf525d654cf05b7 (diff) | |
| parent | 7deacaca5f300b8dcf58f14890861e13dbd89b25 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: ab8eca82f8 -s ours
am: 7deacaca5f -s ours
Change-Id: I1f39abe8cf4b9b01ebf1e552d877e3c7f12e52ae
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions