| commit | a749ea4b47eb3b850225ddc934d4890fc5e77600 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Wed Aug 12 07:03:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 12 07:03:42 2015 +0000 |
| tree | 44bbc7a2e91cda4944c39da898bb0f5d9487a9a4 | |
| parent | c055f9b51a67de39a2fd384d3d974b9b8566884e [diff] | |
| parent | 11cf92aa37b9f51176a2055b1ff97b6211404103 [diff] |
am 11cf92aa: am 1dca55fd: skip the merge of 67e7c661 to lmp-mr1-ub-dev * commit '11cf92aa37b9f51176a2055b1ff97b6211404103': Add support for clobbered blocks