OSDN Git Service

am 49d9aef1: am c3f77cc1: resolved conflicts for merge of 90c4833f to eclair-mr2
authorPatrick Scott <phanna@android.com>
Thu, 3 Dec 2009 04:20:15 +0000 (20:20 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Dec 2009 04:20:15 +0000 (20:20 -0800)
commit2cb937c64b3131aacea43e42cc5ddc12f95dd6ad
treedd28e749b11a338c34a1f23d249977dd6f7b2095
parent688871a280f978274d23f2dd21bcee08a7488e59
parent49d9aef1f4054aa9d6f4d69b850285cccaef9428
am 49d9aef1: am c3f77cc1: resolved conflicts for merge of 90c4833f to eclair-mr2

Merge commit '49d9aef1f4054aa9d6f4d69b850285cccaef9428'

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