| commit | 7285e2c2fc396cb64b18a234bc8d863cd698d8e2 | [log] [tgz] |
|---|---|---|
| author | Russell Brenner <russellbrenner@google.com> | Tue Nov 17 01:47:46 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Nov 17 01:47:46 2015 +0000 |
| tree | 1cf6970d43aa0e260ddfc17a4541462fa3f61ccd | |
| parent | 5df69b530794e23b0f7d7f7f427e13f5ed727eda [diff] | |
| parent | 6a7ff3186b6ad03a08801b8bb3fff5a30185eb4d [diff] |
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de am: 2075d98be6 am: 7d44fe6fdb am: 6a7ff3186b * commit '6a7ff3186b6ad03a08801b8bb3fff5a30185eb4d': Preserve FRP lock if wiped during SUW