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)
commit187ec0ff262ed98e122589dae8deea3c2e6bd0ba
treedee60a58dadb162b4650ef7c6f70c3672a746b21
parentd663a4ee82618faf8685b2ba94903015857119c9
parent7fd676ee26eaff75d6ac47f22cf748269b7e3b57
Merge "Add WiFi toggle prompts - settings" am: b4b2c2aa43 am: 6f126a8f5c am: 6cebca2599
am: 7fd676ee26  -s ours

Change-Id: I6a5d593a4291dbc25bb39c1f177539faccee0183