| commit | 64bcdf44c0c1bb1795879d54ed4c572bfc43eea5 | [log] [tgz] |
|---|---|---|
| author | Casey Dahlin <sadmac@google.com> | Mon Apr 24 13:30:16 2017 -0700 |
| committer | Casey Dahlin <sadmac@google.com> | Thu Apr 27 18:51:07 2017 +0000 |
| tree | 4b428f8dede1a68c03c6926ea666fcdcd17b5a79 | |
| parent | 586cfa78861e71160d5a3dbeaff09554829a1027 [diff] | |
| parent | 367bafc7c153611b39bb41145a9601e5f1cb4934 [diff] |
Merge tag 'mesa-17.0.4' from upstream git This is a -Xtheirs merge, so we're taking upstream as-is. Test: None Bug: 32336912 Change-Id: I2a4c3711f447a69ea0cac5099c67b29292beb609