| commit | a2191764f3536dbbe1596553bb34b929ba19dc0b | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Wed Aug 12 07:04:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 12 07:04:05 2015 +0000 |
| tree | 0cbefe69d8690eedf8b863b8e5c08842edd45af0 | |
| parent | 505186cb7a90866dacbeb714787f5dd529a4f1a0 [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