| commit | cdfb799754f18c5e73263257f2678ef9df9f8f3b | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Jul 12 22:22:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 12 22:22:10 2014 +0000 |
| tree | 76fea165f6784103e7bf4b7302cae28e7924fbe7 | |
| parent | 6d3a8963c329a2b0a2ca4f0a9d1ba5d74c8a5e2b [diff] | |
| parent | 6f7447f377aa79bf2bcf22f41535b142d8b33529 [diff] |
am 6f7447f3: (-s ours) resolved conflicts for merge of f766ea77 to klp-modular-dev-plus-aosp * commit '6f7447f377aa79bf2bcf22f41535b142d8b33529': Cleanup vroot test and fix false positive.