OSDN Git Service

am 506c1015: am cb122bd1: Merge "Wifi settings are in a different namespace now"...
authorChristopher Tate <ctate@google.com>
Wed, 12 Sep 2012 22:28:48 +0000 (15:28 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Sep 2012 22:28:48 +0000 (15:28 -0700)
* commit '506c101577aa8a876b6d939833c34e3b7a6737d3':
  Wifi settings are in a different namespace now


Trivial merge