OSDN Git Service

Merge "Preserve FRP lock if wiped during SUW" into mnc-dev
authorRussell Brenner <russellbrenner@google.com>
Tue, 17 Nov 2015 01:14:11 +0000 (01:14 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 17 Nov 2015 01:14:11 +0000 (01:14 +0000)

Trivial merge