OSDN Git Service

am 52cefc36: resolved conflicts for merge of 6ca56b6a to klp-modular-dev-plus-aosp
authorYing Wang <wangying@google.com>
Tue, 18 Feb 2014 19:24:39 +0000 (19:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Feb 2014 19:24:39 +0000 (19:24 +0000)
* commit '52cefc36cf4718cd85e6e35832b2a8674ba9e838':
  Make the module existence check nonfatal

1  2 
core/main.mk

diff --cc core/main.mk
Simple merge