OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a44129d
830e32c
)
Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev
author
Mahaver Chopra
<mahaver@google.com>
Tue, 24 May 2016 12:22:49 +0000
(12:22 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 24 May 2016 12:22:51 +0000
(12:22 +0000)
Trivial merge