OSDN Git Service

Merge "Wifi settings are in a different namespace now" into jb-mr1-dev
authorChristopher Tate <ctate@google.com>
Tue, 11 Sep 2012 21:59:59 +0000 (14:59 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 11 Sep 2012 22:00:00 +0000 (15:00 -0700)

Trivial merge