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:23:06 +0000 (20:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Nov 2015 20:23:06 +0000 (20:23 +0000)
commit8199c3028c05cd9c85b6f26fe656518f536bda69
tree5288d045c42d012c7b7ccc87dc3722856defd724
parent7d44fe6fdb95dce08e4c8cd1a1c1a1c8f3ea4a63
parent38e932dc816fe7aff6443bfa5648743f527aa097
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1 am: 6967df6421  -s ours am: 439033dd93
am: 38e932dc81

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