OSDN Git Service

am c3f77cc1: resolved conflicts for merge of 90c4833f to eclair-mr2
authorPatrick Scott <phanna@android.com>
Wed, 2 Dec 2009 13:24:28 +0000 (05:24 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Dec 2009 13:24:28 +0000 (05:24 -0800)
commit49d9aef1f4054aa9d6f4d69b850285cccaef9428
treedd28e749b11a338c34a1f23d249977dd6f7b2095
parent1d0c107a170d54bad76e477b5428f25a7217b9b8
parentc3f77cc16633551c4daf1c160f4655762dda9a3b
am c3f77cc1: resolved conflicts for merge of 90c4833f to eclair-mr2

Merge commit 'c3f77cc16633551c4daf1c160f4655762dda9a3b' into eclair-mr2-plus-aosp

* commit 'c3f77cc16633551c4daf1c160f4655762dda9a3b':
  UI changes based on feedback from Jeff and Amar.