From: Colin Cross <ccross@android.com>
Date: Mon, 27 Jan 2014 23:46:39 +0000 (+0000)
Subject: am 4695598d: am ae49acbd: am 1acb1b64: Merge changes I62504bad,I16208cca,I4e4ceec6
X-Git-Tag: android-x86-6.0-r1~1204^2~406
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8c89a9ff9cd461e4bc077a91a0c7c32b17a92ebd;p=android-x86%2Fbuild.git

am 4695598d: am ae49acbd: am 1acb1b64: Merge changes I62504bad,I16208cca,I4e4ceec6

* commit '4695598df1fa11064a54421f60fee66032c673ee':
  add new gen/ directory for generated sources
  warn on LOCAL_MODULE_PATH in multiarch shared libraries
  Support LOCAL_MODULE_RELATIVE_PATH
---

8c89a9ff9cd461e4bc077a91a0c7c32b17a92ebd