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)
commita749ea4b47eb3b850225ddc934d4890fc5e77600
tree44bbc7a2e91cda4944c39da898bb0f5d9487a9a4
parentc055f9b51a67de39a2fd384d3d974b9b8566884e
parent11cf92aa37b9f51176a2055b1ff97b6211404103
am 11cf92aa: am 1dca55fd: skip the merge of 67e7c661 to lmp-mr1-ub-dev

* commit '11cf92aa37b9f51176a2055b1ff97b6211404103':
  Add support for clobbered blocks