OSDN Git Service

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

Change-Id: Idef71123fde9475a549a1ccab136564ccf3d4a4a

1  2 
AndroidManifest.xml
res/values/strings.xml

Simple merge
Simple merge