OSDN Git Service

am 51e97b33: Merge change Ia7c57145 into eclair
authorChia-chi Yeh <chiachi@android.com>
Wed, 7 Oct 2009 18:31:11 +0000 (11:31 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Oct 2009 18:31:11 +0000 (11:31 -0700)
commit9cb59deecc0e72627ebe67c82ff936ba46d2f626
treedc331f45954e0782f4141d4b937ce066f15b20c4
parentecd42371f42ba3d91c2d0c5bcfe5c5c614df9173
parent51e97b33d265709da2aa69c861994574a0544aaa
am 51e97b33: Merge change Ia7c57145 into eclair

Merge commit '51e97b33d265709da2aa69c861994574a0544aaa' into eclair-plus-aosp

* commit '51e97b33d265709da2aa69c861994574a0544aaa':
  SecuritySettings: remove trailing spaces.