tree b947ea0135ff9af769c66ab8ab7bc57ee04d1a0c
parent dc809737f2eb598bfd8d78f96595753c44f4b8bc
parent 67793ab02a2625c34539404b44d9b7098a076cfd
author Dimitry Ivanov <dimitry@google.com> 1472171013 +0000
committer android-build-merger <android-build-merger@google.com> 1472171013 +0000

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

Change-Id: I22514e55948f3176868e5097684ab03b39f3867c