tree 5a0ebadcb0da429ef45c93b772e190abcc7c5ac7
parent fb78e70e2e232a9df8b0e2cc9179f6e37efe8cf6
parent 753e1962e17086dba783fd67c750dfbcac5871c8
author Dan Albert <danalbert@google.com> 1484246657 -0800
committer Dan Albert <danalbert@google.com> 1484246657 -0800

Merge remote-tracking branch 'aosp/master-ndk' into merge-shaderc