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:14:10 +0000 (20:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Nov 2015 20:14:10 +0000 (20:14 +0000)
commit38e932dc816fe7aff6443bfa5648743f527aa097
tree1b3f0c128f34de152c58f9df8afd946fd9ce15b8
parent2075d98be6199032d0bdf65d9e1789153e12fb66
parent439033dd93417b98acff392865166503a507ff30
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1 am: 6967df6421  -s ours
am: 439033dd93

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