commit | b389fe5fb1e30b2c9b43a6de0156d8472db42f71 | [log] [tgz] |
---|---|---|
author | Dan Albert <danalbert@google.com> | Thu Jan 12 10:44:17 2017 -0800 |
committer | Dan Albert <danalbert@google.com> | Thu Jan 12 10:44:17 2017 -0800 |
tree | 5a0ebadcb0da429ef45c93b772e190abcc7c5ac7 | |
parent | fb78e70e2e232a9df8b0e2cc9179f6e37efe8cf6 [diff] | |
parent | 753e1962e17086dba783fd67c750dfbcac5871c8 [diff] |
Merge remote-tracking branch 'aosp/master-ndk' into merge-shaderc