tree b947ea0135ff9af769c66ab8ab7bc57ee04d1a0c
parent 232946f5a985c6a615d64f6bb4adee2c14adf46b
parent 170e6a100bb171c574b51f5ac75bfc10b7497fbd
author Dimitry Ivanov <dimitry@google.com> 1472170673 +0000
committer android-build-merger <android-build-merger@google.com> 1472170673 +0000

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

Change-Id: I01e5bd543dd40efe83d5ddbb4f366b0a4c183cb4