OSDN Git Service

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

Change-Id: I37fe61c02a960ab5024fca8ab025c8e1933d269b