tree 0e855b197e6bb64aa191dfcede4aa208ac9f8d1d
parent 4ae479372170122687383a39d78e1a1714abcf73
parent be49ee652af75a7d33a6fccb76b9f19add913860
author Elliott Hughes <enh@google.com> 1495645818 +0000
committer android-build-merger <android-build-merger@google.com> 1495645818 +0000

Merge "Fix NDK x86 build."
am: be49ee652a

Change-Id: Ia7a63044a9e99e63f4eaa0dd89a9d4ee49eebb07