tree 7f0a17e80cef60ac2940417e4f35b9154d32ec43
parent b31b4cc07debb0a987f7c20d18b6cef059932d3e
parent 9c82554ee3284b57df9d8dfdf11467066ab0877a
author David 'Digit' Turner <digit@google.com> 1402941779 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402941779 +0000

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

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