| commit | 5cfb387e0b49161698b0676b1d359c120bee4819 | [log] [tgz] |
|---|---|---|
| author | David Neto <dneto@google.com> | Mon Jun 20 10:42:28 2016 -0400 |
| committer | David Neto <dneto@google.com> | Mon Jun 20 10:42:36 2016 -0400 |
| tree | 7b447647a7bc12c7a89cb3101cfe7a5bc1c556a3 | |
| parent | 0ed5060aff573ae7de6cba252da540d938cddd0d [diff] | |
| parent | 34d319db9d6cefe93191b921f5f1593378a98c4c [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into update-shaderc-sources Adds the following: 34d319d Merge pull request #8 from KhronosGroup/issue-7-README 231ae2e Fixes #7. Change-Id: I92f592476527d9fa23ee77a80ff1783826ef2649