tree fd67604c10e37deab132b31fff75945b688ce556
parent 2bf8ff62050c5d9a7569dad558fcc5076b55a8d5
parent 25bf90201c4c07ec6648f1b6355661dd6dc9e1be
author Paul Crowley <paulcrowley@google.com> 1490312682 +0000
committer android-build-merger <android-build-merger@google.com> 1490312682 +0000

Merge "Reword the wipe warning message to be more comprehensible." am: f09efaff89 am: eddc9a15f9
am: 25bf90201c

Change-Id: Ie7451d7ed8acb7118655ca90ed1bd738447eef0d