OSDN Git Service

am 0bc64d45: resolved conflicts for merge of e304b9f4 to eclair-mr2
authorNeel Parekh <neel@google.com>
Fri, 23 Oct 2009 01:34:49 +0000 (18:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 23 Oct 2009 01:34:49 +0000 (18:34 -0700)
commit83ee51b4858bfdef133cbb2d103a0d5a3c635ab1
treeaba5d6b3743ef64615916fca9a64501c63f2a9c9
parentaa5a28077c2e6c76da6e6c7f634eaa6bd22a8f7e
parent0bc64d45b418c70dca77a74ddbea62612ae4fe19
am 0bc64d45: resolved conflicts for merge of e304b9f4 to eclair-mr2

Merge commit '0bc64d45b418c70dca77a74ddbea62612ae4fe19' into eclair-mr2-plus-aosp

* commit '0bc64d45b418c70dca77a74ddbea62612ae4fe19':
  Add a intent extra to only show the access points in the settings menu.