OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 11 Jun 2010 20:31:28 +0000 (13:31 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 11 Jun 2010 20:31:28 +0000 (13:31 -0700)
commit00c406364e7bb6b9191e928b1d1e4be9a7bb0960
treede071e3e72477517b9131acf3defef51c06dde57
parent97ece591a65f5848e527d45501d586e613f379bf
parentb2dd90383bae9f3ca0a99b59d3f5992e7fd5ad48
merge from open-source master

Change-Id: I7d167c97600bbf25e2ed8872cffecd9fa5b1db7c
res/xml/settings.xml
tests/AndroidManifest.xml
tests/res/values/strings.xml