| commit | 0ecbf23849a9164eebcb2c965d3b3dc83fd9bcc4 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Thu Jan 12 10:44:04 2017 -0800 |
| committer | Dan Albert <danalbert@google.com> | Thu Jan 12 10:44:04 2017 -0800 |
| tree | 7488de0d234db0613a8671a45f337baf6928bf69 | |
| parent | b5b43c7683bd15dd9d039b36f93aa7d92a410943 [diff] | |
| parent | 3817e324b6c4a72b0c5fe096c6a865d5fc93e3d7 [diff] |
Merge remote-tracking branch 'aosp/master-ndk' into merge-shaderc