OSDN Git Service

[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1...
authorRussell Brenner <russellbrenner@google.com>
Tue, 17 Nov 2015 20:31:54 +0000 (20:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Nov 2015 20:31:54 +0000 (20:31 +0000)
am: 8199c3028c

* commit '8199c3028c05cd9c85b6f26fe656518f536bda69':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW


Trivial merge