tree 44bbc7a2e91cda4944c39da898bb0f5d9487a9a4
parent c055f9b51a67de39a2fd384d3d974b9b8566884e
parent 11cf92aa37b9f51176a2055b1ff97b6211404103
author Tao Bao <tbao@google.com> 1439363022 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439363022 +0000

am 11cf92aa: am 1dca55fd: skip the merge of 67e7c661 to lmp-mr1-ub-dev

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