OSDN Git Service

am c737e92d: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Sep 2012 23:59:12 +0000 (16:59 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Sep 2012 23:59:12 +0000 (16:59 -0700)
commit599dc1d88fb5f2d6ccd85eae3638cbb5376b21b4
treeb819576f83fd4dffc8f56d8f248d33a74907e61d
parent4e818fd46853009d6e4354b5c661a0e3a651a5d4
parentc737e92d4573ae6809f86c812d563ab88fe95d8c
am c737e92d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'c737e92d4573ae6809f86c812d563ab88fe95d8c':
  Wifi settings are in a different namespace now
  Update Settings app to use new namespace for airplane-mode settings