OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d6930b 5d66fa4)
Merge "Change to use new suggestion/condition UI." into oc-dr1-dev am: 9df70249b9
authorDoris Ling <dling@google.com>
Thu, 29 Jun 2017 01:15:23 +0000 (01:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Jun 2017 01:15:23 +0000 (01:15 +0000)
am: 5d66fa4c94  -s ours

Change-Id: Ic17a6314f3088e40a01f34bef67282696ec0bbbb


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