OSDN Git Service

resolved conflicts for merge of a442e791 to eclair-mr2-plus-aosp
authorJim Miller <jaggies@google.com>
Tue, 24 Nov 2009 22:31:37 +0000 (14:31 -0800)
committerJim Miller <jaggies@google.com>
Tue, 24 Nov 2009 22:31:37 +0000 (14:31 -0800)
commit1f9ab2095ac322780aa1b17fbb91936f6ea37c97
tree895c905d8ba8c7469f5012dea493a06479a4dc77
parent9fe7a9c8bd3849836a7cc57cf65483c101ceffc1
parentb5c943a89a499e13d5ac3eac40267089a81badeb
resolved conflicts for merge of a442e791 to eclair-mr2-plus-aosp