tree da2f936e8d77bb2084d2b27c8edeb8f19cd5b1da
parent 7fb605aeb525728edc23aaf3d3fd0ce08a6df95b
parent dbd09e0be713eaab4feba755471a32edc4d203f4
author Dan Albert <danalbert@google.com> 1483677110 -0800
committer Dan Albert <danalbert@google.com> 1483677110 -0800

Merge remote-tracking branch 'aosp/master-ndk' into shader-tools