OSDN Git Service

resolved conflicts for merge of 9b7dba93 to eclair-mr2
authorMike Lockwood <lockwood@android.com>
Thu, 3 Dec 2009 00:57:33 +0000 (19:57 -0500)
committerMike Lockwood <lockwood@android.com>
Thu, 3 Dec 2009 00:57:33 +0000 (19:57 -0500)
commita59a9d25e2b4eb33c56a228f929c0aa13c351b63
tree05298858f77dca3bced5583a57b7e30c35b36342
parent44fe74c901e761746f7308af19ebf53da5ea157c
parentc15de03df8e9d3a1256a57b6ae0a31e862519d9f
resolved conflicts for merge of 9b7dba93 to eclair-mr2

Change-Id: I9a5412b8812aebc934540b1f6f9a9f9c96d89f59