OSDN Git Service

resolved conflicts for merge of b0b2a75d to gingerbread-plus-aosp
authorRaphael <raphael@google.com>
Wed, 13 Oct 2010 20:36:32 +0000 (13:36 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 13 Oct 2010 20:37:32 +0000 (13:37 -0700)
commitf4b26ea7ea0a85e2592a0ec0e439ffa4f3c5a038
tree90249fe4f21252ff0334f82d2bf9b46058986403
parent141c9711d546c161d7ad6b149392dfddf705a26e
parentb0b2a75d798f5e38c76a659367fb6dbd3309acc9
resolved conflicts for merge of b0b2a75d to gingerbread-plus-aosp

Change-Id: Ie475c74ea64cab1e74171a7f885dd3e48f219922