OSDN Git Service

am da08f31f: am 792d4356: Merge "Move NFC setting lower down the Setting\'s list...
authorNick Pelly <npelly@google.com>
Fri, 15 Oct 2010 15:31:26 +0000 (08:31 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 Oct 2010 15:31:26 +0000 (08:31 -0700)
commita3757ca27adc64970c7b39dff51f6e351abd8f57
tree25729375d1f64a7b2748fe9bc9da208c165d5cfa
parent0ceae1cbdcc07c02bc2a8c06334c9636dd6ec379
parentda08f31f791f77be6d0fa2aa67096c3f6e1d8a1c
am da08f31f: am 792d4356: Merge "Move NFC setting lower down the Setting\'s list." into gingerbread

Merge commit 'da08f31f791f77be6d0fa2aa67096c3f6e1d8a1c'

* commit 'da08f31f791f77be6d0fa2aa67096c3f6e1d8a1c':
  Move NFC setting lower down the Setting's list.
res/xml/wireless_settings.xml