OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fd8b8eb cb9a707)
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev
authorChristine Franks <christyfranks@google.com>
Sat, 22 Jul 2017 00:31:39 +0000 (00:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 00:31:39 +0000 (00:31 +0000)
am: cb9a7075f8  -s ours

Change-Id: Id75c03768308873b6b2666eaae6d1c86f23d1663


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help