tree 2a8dbe126d15003e2ddd01a04afeca45600ce186
parent 2dbf06da2ba8be9673de105fd7043a93df62d36a
parent 4d215ad49c3ffc75967679d65b840909289027a5
author Kevin Hufnagle <khufnagle@google.com> 1474929397 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1474929400 +0000

Merge "docs: Wi-Fi settings example now uses Settings constant correctly" into nyc-dev