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