| commit | 3d45000f456eccf9ff720f4df986edb66e462765 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Jul 12 17:40:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 12 17:40:58 2014 +0000 |
| tree | 76fea165f6784103e7bf4b7302cae28e7924fbe7 | |
| parent | fa03d27e80ff88fde82a287980e972c8431b538f [diff] | |
| parent | 89aaa5c1acd05b1d67b6059b39acc7739686adfc [diff] |
am 89aaa5c1: (-s ours) resolved conflicts for merge of dd4775e3 to klp-modular-dev-plus-aosp * commit '89aaa5c1acd05b1d67b6059b39acc7739686adfc': Cleanup vroot test and fix false positive.