OSDN Git Service

Merge "Add WiFi toggle prompts - settings" am: b4b2c2aa43 am: 6f126a8f5c am: 6cebca2599
authorSohani Rao <sohanirao@google.com>
Mon, 14 Nov 2016 21:36:06 +0000 (21:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 14 Nov 2016 21:36:06 +0000 (21:36 +0000)
am: 7fd676ee26  -s ours

Change-Id: I6a5d593a4291dbc25bb39c1f177539faccee0183


Trivial merge