OSDN Git Service

am 6ee7dd09: Merge change 24435 into eclair
authorJaikumar Ganesh <jaikumar@google.com>
Wed, 9 Sep 2009 22:14:00 +0000 (15:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Sep 2009 22:14:00 +0000 (15:14 -0700)
commitc93110409c05bef4be5428ef36099a586828cbb2
treedc9ac0909ab85b938ff6a389b800812c36c24c25
parent8a6730df320b2fa10ac11ea1aad06d85bbed31e4
parent6ee7dd09138363737805ae1e6e93649959c6ab83
am 6ee7dd09: Merge change 24435 into eclair

Merge commit '6ee7dd09138363737805ae1e6e93649959c6ab83' into eclair-plus-aosp

* commit '6ee7dd09138363737805ae1e6e93649959c6ab83':
  Fix display strings and enter passkey handling.
res/values/strings.xml