| commit | 2399a8078d2ad8d298b876fbdb79b67a9ea3b406 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Mon Oct 02 18:37:56 2017 -0700 |
| committer | Dan Albert <danalbert@google.com> | Mon Oct 02 18:37:56 2017 -0700 |
| tree | ed37badb2fc2e09e5c086c680af1f0aaf929824c | |
| parent | 8cf02164e6deb73bbccd7484a3bdad76b4be3411 [diff] | |
| parent | 48feee09e007b52120cfbbcf968ead1e5152c262 [diff] |
Merge remote-tracking branch 'aosp/master-ndk' into r16-shaderc Change-Id: Ieb3a49115d3b741eb664e491cddb452e3e411dcd