tree 9c01f7dae79128bdb6f1f9b2dfcba64d84d0c1e5
parent 23328d97147623b21b12843e9965282d46f9450b
parent 9f078049cf2a17f267610ab81cf8ec5183220490
author Svetoslav Ganov <svetoslavganov@google.com> 1479180500 +0000
committer android-build-merger <android-build-merger@google.com> 1479180500 +0000

Merge "Add WiFi toggle prompts - framework" into stage-aosp-master
am: 9f078049cf

Change-Id: I28501fc58e597c1f5e9d4da6bfaa3a015cad1260