| commit | 52a338b2204861dc1df6e7b44c8f759e22d650f8 | [log] [tgz] |
|---|---|---|
| author | Stan Iliev <stani@google.com> | Wed Apr 25 11:20:40 2018 -0400 |
| committer | Derek Sollenberger <djsollen@google.com> | Wed Apr 25 16:36:11 2018 +0000 |
| tree | 1239a28ae0679a5c74fb110015fe6f1df97f6d7b | |
| parent | 01212fca02ae9fc75173ef2328f6e0be7abb51ca [diff] | |
| parent | 77e95f7067e3bbb4234965c8413f6f86e345bca6 [diff] |
Merge commit '77e95f7067e3bbb4234965c8413f6f86e345bca6' Fix conflict in src/gpu/gl/GrGLCaps.cpp due to the fact that a CL in pi-dev deleted code next to code that we deleted in upstream. The pi-dev deletion is not necessary in master. Exempt-From-Owner-Approval: The merge does not require owner approval. Change-Id: I5613af069edbc27d13d61c09f294a3af39f71f2c