OSDN Git Service

resolved conflicts for merge of d0d351b2 to gingerbread-plus-aosp
authorDavid 'Digit' Turner <digit@google.com>
Mon, 11 Jul 2011 21:20:22 +0000 (23:20 +0200)
committerDavid 'Digit' Turner <digit@google.com>
Mon, 11 Jul 2011 21:43:07 +0000 (23:43 +0200)
commitc8d718012b0ac4abf668a9f494c33d2dd8a314e5
tree2a2dc608da233d4ae150ded771520ab4c66d7aaa
parent03c60a44861951126affa75ba8ee4233c136fe92
parentd0d351b2ef726ff1b76a3efb4aad91e4d1436f6a
resolved conflicts for merge of d0d351b2 to gingerbread-plus-aosp

Change-Id: I1594c21fb3dd761b1e2275be2019ec139cf64174