tree 74021010cdb8072ae86f0adc64357eb493baddec
parent db170e6b00a6f3a25cb9b8c176904c1047c8bb73
parent e8f0971cc852ecf4220cdcde01167b8f4f384f17
author Sami Tolvanen <samitolvanen@google.com> 1420574161 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420574161 +0000

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

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