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)
commit6d5ca9f46bbb3e06a69e1b6465d4fa969fb2ed77
tree1f0c7a7ed26910b9880a48f85854acb7d5367666
parent0158f8f71c78caa0ff8c02ddc2d6698cc90214dd
parent52cefc36cf4718cd85e6e35832b2a8674ba9e838
am 52cefc36: resolved conflicts for merge of 6ca56b6a to klp-modular-dev-plus-aosp

* commit '52cefc36cf4718cd85e6e35832b2a8674ba9e838':
  Make the module existence check nonfatal
core/main.mk