OSDN Git Service

am 11cf92aa: am 1dca55fd: skip the merge of 67e7c661 to lmp-mr1-ub-dev
authorTao Bao <tbao@google.com>
Wed, 12 Aug 2015 07:03:42 +0000 (07:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Aug 2015 07:03:42 +0000 (07:03 +0000)
* commit '11cf92aa37b9f51176a2055b1ff97b6211404103':
  Add support for clobbered blocks


Trivial merge