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:
61082f5
c2bd97a
)
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev am: cb9a7075f8...
author
Christine Franks
<christyfranks@google.com>
Sat, 22 Jul 2017 00:41:22 +0000
(
00:41
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Sat, 22 Jul 2017 00:41:22 +0000
(
00:41
+0000)
am:
c2bd97a5df
Change-Id: I0a3e1f1d9dcca852e1db83a92e2b5884dea02901
Trivial merge