OSDN Git Service

resolved conflicts for merge of ed7b1e77 to eclair-plus-aosp
authorScott Main <smain@google.com>
Mon, 21 Dec 2009 20:33:18 +0000 (12:33 -0800)
committerScott Main <smain@google.com>
Mon, 21 Dec 2009 20:33:18 +0000 (12:33 -0800)
commit4923840cbd1dd1199d866aba136a8e516a8990a8
treec32ab652916b87c2809224f546517c9ff06f0647
parent61fdb24e732f0effb72c70491845a497e99faae1
parented7b1e77eff55c28f2e9dea43152cf999e4df1ea
resolved conflicts for merge of ed7b1e77 to eclair-plus-aosp