commit | 6a7ff3186b6ad03a08801b8bb3fff5a30185eb4d | [log] [tgz] |
---|---|---|
author | Russell Brenner <russellbrenner@google.com> | Tue Nov 17 01:37:51 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Nov 17 01:37:51 2015 +0000 |
tree | 6e4b3bd8fc781f4d22154867892c74741c134a4e | |
parent | 60461f3410151716d34d87ae1ca4ad00620b72eb [diff] | |
parent | 7d44fe6fdb95dce08e4c8cd1a1c1a1c8f3ea4a63 [diff] |
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de am: 2075d98be6 am: 7d44fe6fdb * commit '7d44fe6fdb95dce08e4c8cd1a1c1a1c8f3ea4a63': Preserve FRP lock if wiped during SUW