tree 779f78fe23bda595f237f2d9d2fa80d4d321e71f
parent fa0dc56b9d264bc38a7b508ccfbbc2bdcb475d73
parent 6b4e9fd4a30c2e6a0c0f102a09dc833717f8289d
author Mike Cleron <mcleron@google.com> 1257812794 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257812794 -0800

am 6b4e9fd4: am eec2eaa4: am c4bb5d41: Merge change I3c675fc6 into eclair

Merge commit '6b4e9fd4a30c2e6a0c0f102a09dc833717f8289d'

* commit '6b4e9fd4a30c2e6a0c0f102a09dc833717f8289d':
  New defaults for Passion