tree 52515d5aae4f529cc992ca7110b4c6d86c7f6c0e
parent 8f05973b2cb583fbc6f950c137396cc3e9fdc50f
parent a14954cb8fd4b7b6030dfae3a77ef926e12f3a7a
author Dan Albert <danalbert@google.com> 1527196256 -0700
committer Dan Albert <danalbert@google.com> 1527196256 -0700

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

Change-Id: Iaddebd733ccc713ab80ea21a7b287ab14d837df5