tree b947ea0135ff9af769c66ab8ab7bc57ee04d1a0c
parent 825b2fd4b69e4047f07a58a12c60f2ca1b76f479
parent 2a8a3b47a434974eb622355ccc6dd6f0a2e280dd
author Dimitry Ivanov <dimitry@google.com> 1472175559 +0000
committer android-build-merger <android-build-merger@google.com> 1472175559 +0000

Merge "Use correct LOCAL_MODULE_TARGET_ARCH for x86_64" am: 170e6a100b am: fd46044fef am: 67793ab02a
am: 2a8a3b47a4

Change-Id: Ie11829e546c5e3e6a10b5ecedb3dfca1d1e85745