tree e4bae883f9d7403845884db9292230fe3ad09bb5
parent 93c4c49b9185e4f0b03d6456c16e07fc6eb30710
parent e6d74378e855ac868d89125a567e7cba203a4085
author Nick Kralevich <nnk@google.com> 1405177981 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405177981 +0000

am e6d74378: am fb36e884: am 43cb7695: Merge "Revert "Cleanup vroot test and fix false positive."" into jb-dev

* commit 'e6d74378e855ac868d89125a567e7cba203a4085':
  Revert "Cleanup vroot test and fix false positive."