OSDN Git Service

am 01a868d7: Merge "Strings for new Dock settings screen, to get started on the L10N...
authorAmith Yamasani <yamasani@google.com>
Fri, 15 Jan 2010 01:04:45 +0000 (17:04 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 Jan 2010 01:04:45 +0000 (17:04 -0800)
commit3b7ffa5eeff9fddbbfdf3c8bdff4b19b1eb7a4df
tree37126e2782239e685a9127d9b14b9a88b2ecbc4c
parent49efbf8b5b7a6817a4a1020982cb34f4ca226d48
parent01a868d73b2c0a8c969a4ad37af0e0a98a9eb156
am 01a868d7: Merge "Strings for new Dock settings screen, to get started on the L10N." into eclair

Merge commit '01a868d73b2c0a8c969a4ad37af0e0a98a9eb156' into eclair-plus-aosp

* commit '01a868d73b2c0a8c969a4ad37af0e0a98a9eb156':
  Strings for new Dock settings screen, to get started on the L10N.
res/values/strings.xml