tree 3116550620911b4cc7b1c594178e79e2cee612ba
parent 07b132823683dfbd2ff06794fc056582427987f9
parent 55d7069ce6dae98c5e872ab433b6fa95a7855aca
author Dan Albert <danalbert@google.com> 1527196296 -0700
committer Dan Albert <danalbert@google.com> 1527196296 -0700

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

Change-Id: I6350dd25fa37afc241d9ab24980176c43631f5b9