diff options
| author | Stanley Tng <stng@google.com> | 2018-10-17 08:33:44 -0700 |
|---|---|---|
| committer | Stanley Tng <stng@google.com> | 2018-10-17 08:33:56 -0700 |
| commit | f093798a61ed90b68c14b86e7fb8c88d375ce51a (patch) | |
| tree | 364b6295dad22e28ec99eafaa78719b9733be679 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | acbcff9e7dcaacd1db833aa9923897ffa734878f (diff) | |
| parent | 23ccecc4ca9f58139baa72bd4783451b780b1eb5 (diff) | |
resolve merge conflicts of 23ccecc4ca9f58139baa72bd4783451b780b1eb5 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I5fbdb4b246cc34ac5c6fcfe39e41a16137e9f9ab
Merged-In: Id2dc364dfa815e72db91b92bcee9745e6c40d34a
Merged-In: Ia9df6facd99ae91ebb4a819f61ea27551ce35efe
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions