OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4eba395 1c4f12c)
Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings" am: 8c11340b0c -s ours...
authorMarie Janssen <jamuraa@google.com>
Mon, 12 Dec 2016 21:51:56 +0000 (21:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 12 Dec 2016 21:51:56 +0000 (21:51 +0000)
am: 1c4f12c6db  -s ours

Change-Id: I63dce574c3f4f42a4d02d1e0105f02fd32e68ba3


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