tree b947ea0135ff9af769c66ab8ab7bc57ee04d1a0c
parent 72a1ff03a1b73eb192a55d1709dc60ecfb23b461
parent fd46044fef3b7e3f740d8ad077e2bc8a83783c23
author Dimitry Ivanov <dimitry@google.com> 1472170852 +0000
committer android-build-merger <android-build-merger@google.com> 1472170852 +0000

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

Change-Id: I004260c20888a8ea58ea763c409a3ebdfa4655b8