OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6a7ff31
8199c30
)
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1...
author
Russell Brenner
<russellbrenner@google.com>
Tue, 17 Nov 2015 20:31:54 +0000
(20:31 +0000)
committer
android-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