| commit | e8a86aa60c83fe2aa9c47386b9b6bea8f88e64ca | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed May 24 17:10:18 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 24 17:10:18 2017 +0000 |
| tree | 0e855b197e6bb64aa191dfcede4aa208ac9f8d1d | |
| parent | 4ae479372170122687383a39d78e1a1714abcf73 [diff] | |
| parent | be49ee652af75a7d33a6fccb76b9f19add913860 [diff] |
Merge "Fix NDK x86 build." am: be49ee652a Change-Id: Ia7a63044a9e99e63f4eaa0dd89a9d4ee49eebb07