OSDN Git Service

Merge "Preserve FRP lock if wiped during SUW" into mnc-dev
authorRussell Brenner <russellbrenner@google.com>
Tue, 17 Nov 2015 01:22:41 +0000 (01:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Nov 2015 01:22:41 +0000 (01:22 +0000)
am: f0ff1631de

* commit 'f0ff1631dee1d988151f8260e6c65ff836a40e80':
  Preserve FRP lock if wiped during SUW


Trivial merge