| commit | a51ed9afc6373cb3892bd508c82f0d33aecec317 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed May 24 17:18:30 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 24 17:18:30 2017 +0000 |
| tree | 2147564fe15c76a2319eea333564238d764ae3e2 | |
| parent | 59d615f82d9307a7d94ec632bfb4a67f7fc23dea [diff] | |
| parent | 156bbcd854677c9111bea818b8cfa2c86b196555 [diff] |
Merge "Fix NDK x86 build." am: be49ee652a am: e8a86aa60c am: 75cf91a0f6 am: 156bbcd854 Change-Id: I4cc52a8be7784c4eb71d358f4dd0ec395bb6737c