OSDN Git Service

Merge changes I2514f66f,I71fed98d
authorColin Cross <ccross@android.com>
Fri, 14 Feb 2014 00:24:16 +0000 (00:24 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 14 Feb 2014 00:24:16 +0000 (00:24 +0000)
commit3bbaab31069045aea9ae33c1d995640e56182a82
tree3827194324af10e8d486e64d9a7b4c0f3aa5ee2a
parente2f06adb8873ede16f829690b4dbab07b8121aa8
parente18cb93e48bb4dc250e30f5bd22df9590d0b60e8
Merge changes I2514f66f,I71fed98d

* changes:
  support LOCAL_MODULE_TARGET_ARCH for prebuilts
  Add generated sources dir to the default include path