tree 74f6bd2e24d4ea3841d9dc4eb8c5c2e6f038c0ab
parent aad1accb587aa708012b329c784332dcc9991de6
parent fb0c62963b5fe1b4f36e281c4c02d98d737d08ee
author David 'Digit' Turner <digit@google.com> 1402951905 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402951905 +0000

am fb0c6296: am 9c82554e: Merge "Ignore wipe operation on non-block devices."

* commit 'fb0c62963b5fe1b4f36e281c4c02d98d737d08ee':
  Ignore wipe operation on non-block devices.