OSDN Git Service

resolved conflicts for merge of aafb2fd2 to eclair-mr2
authorPatrick Scott <phanna@android.com>
Mon, 19 Oct 2009 20:37:42 +0000 (16:37 -0400)
committerPatrick Scott <phanna@android.com>
Mon, 19 Oct 2009 20:37:42 +0000 (16:37 -0400)

No differences found