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