OSDN Git Service

am 59320c13: am 9b2077d4: am 3bbaab31: Merge changes I2514f66f,I71fed98d
authorColin Cross <ccross@android.com>
Fri, 21 Feb 2014 18:35:12 +0000 (10:35 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Feb 2014 18:35:12 +0000 (10:35 -0800)
commita2b8199b64b2eef8027e9d61749f44a89195badd
tree90785b7f152c8ece6aaf612c5a0ef4a1cb42108c
parent01d8b2aa978ea99e568b4869da389f9a01a76c2a
parent59320c13748be94db4267a26f43fe26dcf6938a2
am 59320c13: am 9b2077d4: am 3bbaab31: Merge changes I2514f66f,I71fed98d

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