OSDN Git Service

am 6d5ca9f4: am 52cefc36: resolved conflicts for merge of 6ca56b6a to klp-modular...
authorYing Wang <wangying@google.com>
Fri, 21 Feb 2014 18:35:24 +0000 (10:35 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Feb 2014 18:35:24 +0000 (10:35 -0800)
* commit '6d5ca9f46bbb3e06a69e1b6465d4fa969fb2ed77':
  Make the module existence check nonfatal


Trivial merge