tree b00b9e87f54c91cb5b41efea87f98f30e9e191ca
parent 6cd7a08592cf568d595069552d3bb6cf21addb66
parent c53edfb6aaf8db93a1a19532327ee06e04f5a5bd
author Dan Albert <danalbert@google.com> 1527196282 -0700
committer Dan Albert <danalbert@google.com> 1527196282 -0700

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

Change-Id: I4b7181e49000dd07bc0cca5d0f2fa848f4018e78