app_Settings

Go to file

Neel Parekh 83ee51b485 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.

2009-10-22 18:34:49 -07:00

res

am 0bc64d45: resolved conflicts for merge of e304b9f4 to eclair-mr2

2009-10-22 18:34:49 -07:00

src/com/android/settings

resolved conflicts for merge of e304b9f4 to eclair-mr2

2009-10-22 18:26:46 -07:00

tests

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

Android.mk

auto import from //branches/cupcake/...@137197

2009-03-09 11:52:14 -07:00

AndroidManifest.xml

am f20623b2: Merge change I6983cab3 into eclair-mr2

2009-10-13 03:00:12 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00