tree 1f0c7a7ed26910b9880a48f85854acb7d5367666
parent 0158f8f71c78caa0ff8c02ddc2d6698cc90214dd
parent 52cefc36cf4718cd85e6e35832b2a8674ba9e838
author Ying Wang <wangying@google.com> 1392751479 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392751479 +0000

am 52cefc36: resolved conflicts for merge of 6ca56b6a to klp-modular-dev-plus-aosp

* commit '52cefc36cf4718cd85e6e35832b2a8674ba9e838':
  Make the module existence check nonfatal