| commit | b252c470366118af0db2b4395217bedffb4c2e01 | [log] [tgz] |
|---|---|---|
| author | David Neto <dneto@google.com> | Wed Nov 30 13:47:17 2016 -0500 |
| committer | David Neto <dneto@google.com> | Wed Nov 30 13:58:30 2016 -0500 |
| tree | 50389a22d1a3784cba1dcad63c2ccc13efbec10e | |
| parent | e9f7d8ac3cda59f2637776eea1dfad0e171fba21 [diff] | |
| parent | bd47a9abaefac00be692eae677daed1b977e625c [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into update-shaderc Includes the following: bd47a9a Add Imagination as a vendor and reserve an enum range for them. Test: checkbuild.py on Linux x86; unit tests on Windows Change-Id: I4c03de66c7e8e2170a2bdfeffaba125ec543571e