| commit | 9b020b2c0b467a4a9c5c00b9771bca956223bc49 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Thu May 24 14:11:36 2018 -0700 |
| committer | Dan Albert <danalbert@google.com> | Thu May 24 14:11:36 2018 -0700 |
| tree | 3116550620911b4cc7b1c594178e79e2cee612ba | |
| parent | 07b132823683dfbd2ff06794fc056582427987f9 [diff] | |
| parent | 55d7069ce6dae98c5e872ab433b6fa95a7855aca [diff] |
Merge remote-tracking branch 'aosp/master-ndk' into shaderc-update Change-Id: I6350dd25fa37afc241d9ab24980176c43631f5b9