commit | 1c178a1352500fd0945de6ecf5e131efac0313a8 | [log] [tgz] |
---|---|---|
author | Dan Albert <danalbert@google.com> | Mon Oct 02 18:37:19 2017 -0700 |
committer | Dan Albert <danalbert@google.com> | Mon Oct 02 18:37:19 2017 -0700 |
tree | 528e1ca658f3f57b4222eb003f5096ecb72c359d | |
parent | f65b8dc5779b7124e4d471fdeb06187ead50274e [diff] | |
parent | a6a1f542cf118d3b202466d3521c6e2316e36ad4 [diff] |
Merge remote-tracking branch 'aosp/master-ndk' into r16-shaderc Change-Id: I23276486913ea38e64c45e4b5d35e95645ebd7e4