OSDN Git Service

resolved conflicts for merge of 3154443d to gingerbread-plus-aosp
authorDavid 'Digit' Turner <digit@google.com>
Mon, 11 Jul 2011 23:23:22 +0000 (01:23 +0200)
committerDavid 'Digit' Turner <digit@google.com>
Mon, 11 Jul 2011 23:23:22 +0000 (01:23 +0200)
commite20724c9c530e03bdeaf3f6ff31f2334ea7ffc72
treee496042a851d09b187e2a1ed754e60fc16340c39
parent8bc4f69c082b6202f4ad25df0819dd2c61b84292
parent3154443d23340db7663d1483ac3dccabadf35257
resolved conflicts for merge of 3154443d to gingerbread-plus-aosp

Change-Id: I9f547b2e5ea97a503abd7a6a18811af309913345