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