summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-09-26 17:42:25 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-26 17:42:25 -0700
commit4d34b227b482b702b8640d7307cdb7358cd1c362 (patch)
tree2a6ff48d8bf8910f59ff1eed1c46f734ff297ace
parentd312529325a553883f27d89f468fed68406f52bb (diff)
parent32d54b19367505547a67c2b717047fdab375db94 (diff)
downloadpackages_apps_settings-4d34b227b482b702b8640d7307cdb7358cd1c362.zip
packages_apps_settings-4d34b227b482b702b8640d7307cdb7358cd1c362.tar.gz
packages_apps_settings-4d34b227b482b702b8640d7307cdb7358cd1c362.tar.bz2
am 32d54b19: reconcile froyo-release into gingerbread
Merge commit '32d54b19367505547a67c2b717047fdab375db94' into gingerbread-plus-aosp * commit '32d54b19367505547a67c2b717047fdab375db94': Remove Search from the system Settings app DO NOT MERGE
0 files changed, 0 insertions, 0 deletions