OSDN Git Service

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

Change-Id: I8cfaadb7dd8df6d81695dea8530a25de69fcce3d


Trivial merge