tree e2581d8b4d7fc066ec2dfe9b72456290f0743b72
parent aeeaee58a11eca3c533cf0b272b5ac1bd61d4729
parent 4f8fa5ba3c3abef02023a219602df8880deaedf6
author Sami Tolvanen <samitolvanen@google.com> 1420543431 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420543431 +0000

am 4f8fa5ba: Merge "Fix disable-verity when the underlying block device is RO"

* commit '4f8fa5ba3c3abef02023a219602df8880deaedf6':
  Fix disable-verity when the underlying block device is RO