OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4e818fd c737e92)
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)
* commit 'c737e92d4573ae6809f86c812d563ab88fe95d8c':
  Wifi settings are in a different namespace now
  Update Settings app to use new namespace for airplane-mode settings


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help