tree 6f95c30047da19dceaf7f43b051f8a643741da21
parent 9caec6b4540fdc43d8a54ebf15a36ca04aeb9c17
parent e8a86aa60c83fe2aa9c47386b9b6bea8f88e64ca
author Elliott Hughes <enh@google.com> 1495645980 +0000
committer android-build-merger <android-build-merger@google.com> 1495645980 +0000

Merge "Fix NDK x86 build." am: be49ee652a
am: e8a86aa60c

Change-Id: I17aac83cf55a109a150c5ce99a14a4cb047b4277