OSDN Git Service

am 9b2077d4: am 3bbaab31: Merge changes I2514f66f,I71fed98d
authorColin Cross <ccross@android.com>
Fri, 14 Feb 2014 00:35:33 +0000 (00:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Feb 2014 00:35:33 +0000 (00:35 +0000)
commit59320c13748be94db4267a26f43fe26dcf6938a2
tree1b3b609cd69af6ca7b4f6f1e9ed6719b0e52ccc7
parent1fd8265d1a1a48d8c1805553669bbefb32956deb
parent9b2077d4b969e9f8598242915f094552c5d78ad5
am 9b2077d4: am 3bbaab31: Merge changes I2514f66f,I71fed98d

* commit '9b2077d4b969e9f8598242915f094552c5d78ad5':
  support LOCAL_MODULE_TARGET_ARCH for prebuilts
  Add generated sources dir to the default include path