| commit | 156bbcd854677c9111bea818b8cfa2c86b196555 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed May 24 17:16:00 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 24 17:16:00 2017 +0000 |
| tree | da065dc1203a5d3bace31437fa9ad7eecf51e34b | |
| parent | 287fad90c6e34c47adae6878200bb618f265eb26 [diff] | |
| parent | 75cf91a0f69137b04066666082f76712dbac6ee7 [diff] |
Merge "Fix NDK x86 build." am: be49ee652a am: e8a86aa60c am: 75cf91a0f6 Change-Id: I6ecb3282484bf00a5d0336dd1e376be2c2a9e2d5