OSDN Git Service

Merge "Add WiFi toggle prompts - framework" am: 584b5cee49 -s ours
authorSohani Rao <sohanirao@google.com>
Mon, 14 Nov 2016 21:21:38 +0000 (21:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 14 Nov 2016 21:21:38 +0000 (21:21 +0000)
am: 31082a0824  -s ours

Change-Id: Ib2d485f7c6904fc3890c08f34d52703b92d379b5


Trivial merge