commit | 6d39f6449b8dd94029fedcd19bff883555ea5e94 | [log] [tgz] |
---|---|---|
author | Dan Albert <danalbert@google.com> | Thu Jan 12 10:44:40 2017 -0800 |
committer | Dan Albert <danalbert@google.com> | Thu Jan 12 10:44:40 2017 -0800 |
tree | 42ff188eceef33ca02362cabdeb4db80b0a6ca7a | |
parent | e14d3676023f15de41ceab51fe2f2358ccd01876 [diff] | |
parent | 016fdf77183ed931a7c9d002ee9a4c81861ebf15 [diff] |
Merge remote-tracking branch 'aosp/master-ndk' into merge-shaderc