tree f7fdd21da3942576ad9b8eac59dd2187acdaded0
parent cd3d35920526098fa3ba5d88c27ad5358c96909c
parent 47733eafdc37203d59a8a0a17ccfb936d2920e31
author Elliott Hughes <enh@google.com> 1427234551 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427234551 +0000

am 47733eaf: Merge "Fix wipe command when using sideload in recovery"

* commit '47733eafdc37203d59a8a0a17ccfb936d2920e31':
  Fix wipe command when using sideload in recovery