OSDN Git Service

am de3e5665: Add phase2 authentication settings
authorIrfan Sheriff <isheriff@google.com>
Thu, 3 Jun 2010 18:13:21 +0000 (11:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Jun 2010 18:13:21 +0000 (11:13 -0700)
commita496684019497395b71c6d460501197a74e21e0e
tree4372a8e824ea938708f30c7ce69ab4f5c00a757c
parent7c5717c0647bf31d0bf5a3b04971dabb4ee0a16c
parentde3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1
am de3e5665: Add phase2 authentication settings

Merge commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1' into froyo-plus-aosp

* commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1':
  Add phase2 authentication settings
res/values/strings.xml