OSDN Git Service

am cb122bd1: Merge "Wifi settings are in a different namespace now" into jb-mr1-dev
authorChristopher Tate <ctate@google.com>
Tue, 11 Sep 2012 22:01:32 +0000 (15:01 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 Sep 2012 22:01:32 +0000 (15:01 -0700)
* commit 'cb122bd15a1b406e99e3760f01350367857f8f55':
  Wifi settings are in a different namespace now


Trivial merge