OSDN Git Service

am 6443630c: am 441e9452: resolved conflicts for merge of f3e25fea to klp-modular...
authorColin Cross <ccross@android.com>
Thu, 27 Mar 2014 00:21:55 +0000 (00:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Mar 2014 00:21:55 +0000 (00:21 +0000)
commit5dde91231bd05821080b5bad60f337ab9368ec22
tree31d28b3d079971f5c7d1e08e8ff3b0976c2cee1d
parent56760822cbea6d5702901ca670ae37f129677d4b
parent6443630ccaa5866a9181f869d4f21ddc728d2f7e
am 6443630c: am 441e9452: resolved conflicts for merge of f3e25fea to klp-modular-dev-plus-aosp

* commit '6443630ccaa5866a9181f869d4f21ddc728d2f7e':
  add support for LOCAL_MULTILIB