tree 88bbf8f1a4baf2d4649f1fe70d356fdd7b5952b1
parent bc3d2ee5e505c8c61f47903235b86b8c19218286
parent eddc9a15f906648a693ffc0a3f186549f7f66155
author Paul Crowley <paulcrowley@google.com> 1490312501 +0000
committer android-build-merger <android-build-merger@google.com> 1490312501 +0000

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

Change-Id: I41c7a52fda6b0df63869640193a198a98801ed75