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