diff options
| author | karthik bharadwaj <karthikmb@google.com> | 2020-06-25 11:22:41 -0700 |
|---|---|---|
| committer | karthik bharadwaj <karthikmb@google.com> | 2020-06-25 11:22:41 -0700 |
| commit | e31036100d6d32138485f396d997951dd33fa43c (patch) | |
| tree | 1aa21acd5620bbd8433aad078060a3540500e3d0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 23edb1efc274d0e5e178d91039dad8d67ba3b47d (diff) | |
Remove a newline to prevent a merge conflict
Upstream AOSP change doesn't have a newline at the location
this change addresses, causing a merge conflict
Test: Build, presubmit
Bug: 159464174
Merged-In: I957dfe35aacc3e397611d8ab0b9ad19a1130a3dd
Change-Id: I7614d420ad55129b04e0dfa9310e39d715ed2da7
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions