OSDN Git Service

am 4695598d: am ae49acbd: am 1acb1b64: Merge changes I62504bad,I16208cca,I4e4ceec6
authorColin Cross <ccross@android.com>
Mon, 27 Jan 2014 23:46:39 +0000 (23:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Jan 2014 23:46:39 +0000 (23:46 +0000)
* commit '4695598df1fa11064a54421f60fee66032c673ee':
  add new gen/ directory for generated sources
  warn on LOCAL_MODULE_PATH in multiarch shared libraries
  Support LOCAL_MODULE_RELATIVE_PATH


Trivial merge