commit | 98631a39caf134c09c806c96aa2ccab48f82e58a | [log] [tgz] |
---|---|---|
author | Paul Crowley <paulcrowley@google.com> | Thu Dec 22 16:08:51 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 22 16:08:51 2016 +0000 |
tree | 9edfc400ae20350957934f7109d2e394832c7891 | |
parent | 794075c575ebc9d08bbb2f5146e763f40b399291 [diff] | |
parent | 11e9af909d58269d53ccfb89b4ad12b9a8fdedf3 [diff] |
Merge "Support a "ask before wiping" boot flag." am: 7ec4e6f5a3 am: bc344ba7b9 am: 11e9af909d Change-Id: Ib07bb356ac6fac309716e76b2d9d4b1581518cdf