am c737e92d: (-s ours) Reconcile with jb-mr1-release - do not merge

Browse Source

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

...

This commit is contained in:

The Android Open Source Project

2012-09-12 16:59:12 -07:00

committed by Android Git Automerger

parent 4e818fd468 c737e92d45

commit 599dc1d88f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available