OSDN Git Service

am fc8b6338: resolved conflicts for merge of d65a7da3 to jb-mr2-dev-plus-aosp
authorYing Wang <wangying@google.com>
Thu, 15 Aug 2013 21:34:09 +0000 (14:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 15 Aug 2013 21:34:09 +0000 (14:34 -0700)
commit3208b615c5cde2b682c3bbbcd2bb064b14b57489
tree2c0dbc42bbcbce4cd16918ca0591afdc1a339a94
parent477b12b45ad0c8e73aafe12e3056c051080c0de9
parentfc8b6338510690f1f87c57b9d9c470e25fc48bcd
am fc8b6338: resolved conflicts for merge of d65a7da3 to jb-mr2-dev-plus-aosp

* commit 'fc8b6338510690f1f87c57b9d9c470e25fc48bcd':
  No need to filter out AndroidConfig.h for unbundled build
core/binary.mk