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)
commitbcf3b75f5732cc270d1974edd2cf1ed48863cb31
tree6e4b3bd8fc781f4d22154867892c74741c134a4e
parent6a7ff3186b6ad03a08801b8bb3fff5a30185eb4d
parent8199c3028c05cd9c85b6f26fe656518f536bda69
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1 am: 6967df6421  -s ours am: 439033dd93 am: 38e932dc81
am: 8199c3028c

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