diff options
| author | Bill Yi <byi@google.com> | 2016-07-25 17:50:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-25 17:50:33 +0000 |
| commit | 4312b2dbab27e130a33c1fd9ca4435a4758f5354 (patch) | |
| tree | 5bd738c68e6b616913ed855348954caa28c4de69 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5c328af37c36996565621d06e1388d2159516072 (diff) | |
| parent | 502796fe08725c4977b6f4582721b158fe52c138 (diff) | |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: a2d4d0b599 -s ours
am: 502796fe08 -s ours
Change-Id: I047291f0785d1f2597910ca7aa2d191b19f20b33
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions