commit | 75cf91a0f69137b04066666082f76712dbac6ee7 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Wed May 24 17:13:00 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed May 24 17:13:00 2017 +0000 |
tree | 6f95c30047da19dceaf7f43b051f8a643741da21 | |
parent | 9caec6b4540fdc43d8a54ebf15a36ca04aeb9c17 [diff] | |
parent | e8a86aa60c83fe2aa9c47386b9b6bea8f88e64ca [diff] |
Merge "Fix NDK x86 build." am: be49ee652a am: e8a86aa60c Change-Id: I17aac83cf55a109a150c5ce99a14a4cb047b4277