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:
a17567b
8061500
)
Merge "Move logic for FR in demo mode out of Settings" into oc-mr1-dev am: fd8b8eb0b1
author
Christine Franks
<christyfranks@google.com>
Sat, 22 Jul 2017 00:32:30 +0000
(
00:32
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Sat, 22 Jul 2017 00:32:30 +0000
(
00:32
+0000)
am:
8061500847
Change-Id: I76248c968334e04f9b878f184f60596cf5750a68
Trivial merge