| commit | 30a252fa4397625889ea167d498c020aabf1274f | [log] [tgz] |
|---|---|---|
| author | David Neto <dneto@google.com> | Thu Feb 25 15:26:46 2016 -0500 |
| committer | David Neto <dneto@google.com> | Thu Feb 25 15:27:21 2016 -0500 |
| tree | a617fe69da5d2d349fad7ed8ccae724f1c88e63b | |
| parent | e4f8ff6c7bb07e05e910693ac1948b8cac41b873 [diff] | |
| parent | f5759f9a8860dcd0e27489ae09bc5cd8f012b0d8 [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into update-ndk-r11-release Pulls in the following: f5759f9 Install glslc when installing other binaries. 6d40444 Fixed the windows build. Change-Id: I1856b271148e52533543f527c654456beb66bd85