OSDN Git Service

Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de
authorRussell Brenner <russellbrenner@google.com>
Tue, 17 Nov 2015 01:29:12 +0000 (01:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Nov 2015 01:29:12 +0000 (01:29 +0000)
commit7d44fe6fdb95dce08e4c8cd1a1c1a1c8f3ea4a63
tree5288d045c42d012c7b7ccc87dc3722856defd724
parent773b8a3c4422ab9daf7adb62895568852b43882e
parent2075d98be6199032d0bdf65d9e1789153e12fb66
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de
am: 2075d98be6

* commit '2075d98be6199032d0bdf65d9e1789153e12fb66':
  Preserve FRP lock if wiped during SUW