OSDN Git Service

resolved conflicts for merge of 01d2087c to eclair-plus-aosp
authorXavier Ducrohet <xav@android.com>
Thu, 19 Nov 2009 01:45:09 +0000 (17:45 -0800)
committerXavier Ducrohet <xav@android.com>
Thu, 19 Nov 2009 01:45:09 +0000 (17:45 -0800)
commit3163b2c662b4f1edab123800be0945d4dd28c297
tree1cde858eed9a195e2fbdf7a0194d12c873c5f2d1
parente0fd64883116598b2fd15635d3cb19dadb90198d
parent19c902fc1f841d308782ce48e41de82c6e064781
resolved conflicts for merge of 01d2087c to eclair-plus-aosp