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