tree 9edfc400ae20350957934f7109d2e394832c7891
parent 88bd5d59de100adce3f674ae9549caa120dcd6a3
parent bc344ba7b9e11675f2cf0210039bdd47e4ddcb9b
author Paul Crowley <paulcrowley@google.com> 1482422600 +0000
committer android-build-merger <android-build-merger@google.com> 1482422600 +0000

Merge "Support a "ask before wiping" boot flag." am: 7ec4e6f5a3
am: bc344ba7b9

Change-Id: I8f10c9fc59dce2954b8473b6eb648abe8d55612a