OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa5a280 0bc64d4)
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)
Merge commit '0bc64d45b418c70dca77a74ddbea62612ae4fe19' into eclair-mr2-plus-aosp

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


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