OSDN Git Service

resolved conflicts for merge of 1ff9ad3f to master
authorNick Pelly <npelly@google.com>
Wed, 29 Sep 2010 19:10:35 +0000 (12:10 -0700)
committerNick Pelly <npelly@google.com>
Wed, 29 Sep 2010 19:10:35 +0000 (12:10 -0700)
commitd83aaf28bce5472564ddfb6f3d8660459c826d17
tree04e4a865162cc223e9d409e2f80d2c9a343caeba
parent5809d33296d60f54c7e93de2f45bd84579f70449
parent1ff9ad3fb4947c458eaf4a99f0cd32834ee53943
resolved conflicts for merge of 1ff9ad3f to master

Change-Id: I55137a241e13ec7da1d413cf9b7fd1c1fdd8c4d1
AndroidManifest.xml
res/values/strings.xml
res/xml/wireless_settings.xml
src/com/android/settings/WirelessSettings.java