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:40:38 +0000 (20:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Nov 2015 20:40:38 +0000 (20:40 +0000)
commit4868199d28e2a6355be779449b7986743698cc82
tree1cf6970d43aa0e260ddfc17a4541462fa3f61ccd
parent7285e2c2fc396cb64b18a234bc8d863cd698d8e2
parentbcf3b75f5732cc270d1974edd2cf1ed48863cb31
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1 am: 6967df6421  -s ours am: 439033dd93 am: 38e932dc81 am: 8199c3028c
am: bcf3b75f57

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