diff options
| author | Trevor Johns <trevorjohns@google.com> | 2016-04-12 10:13:47 -0700 |
|---|---|---|
| committer | Trevor Johns <trevorjohns@google.com> | 2016-04-19 02:03:59 -0700 |
| commit | 682c24e22811d4ee17ae1cd61bf255c3f7e722b7 (patch) | |
| tree | 14ae11892022b653871ede366b09277254704f5a /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 65136ac6a4f6fb2423a0768b451782dcd0e960d5 (diff) | |
Resolve merge conflicts of a5060ee to nyc-dev
This undoes the automerger skip which occured in
commit e740c84dc32180214a7fd157105d6c18d30408ee and
replays it as a standard (NOT -s ours) merge.
Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions