OSDN Git Service

Merge "Add SettingsMultiSelectListPreference style DO NOT MERGE" am: 8378efc6af ...
authorYoshinori Hirano <Yoshinori.Hirano@sony.com>
Sat, 24 Feb 2018 23:54:26 +0000 (23:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 24 Feb 2018 23:54:26 +0000 (23:54 +0000)
commite847fbe6a00d61eede9980af37ce2e07575d6812
tree0d28a207988a06aa679ab9680b2a3de91caa0f74
parentc9f1e73dc723bd73e38abf8c148db5dbf7680d40
parent942249a2dd40cf1b999fd79400327d0596999ab8
Merge "Add SettingsMultiSelectListPreference style DO NOT MERGE" am: 8378efc6af  -s ours
am: 942249a2dd  -s ours

Change-Id: I23af2770255199348eaa8c69d990ff2907ff90de