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:
ff43d8f
22430d5
)
DO NOT MERGE - Require password to FR in carrier demo mode
author
Christine Franks
<christyfranks@google.com>
Wed, 1 Feb 2017 19:14:41 +0000
(19:14 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 1 Feb 2017 19:14:41 +0000
(19:14 +0000)
am:
22430d5abb
Change-Id: Ib3d154cb753b07278355ec1c34dca5916f619774
Trivial merge