reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:09:40 +0000 (08:09 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:09:40 +0000 (08:09 -0800)
commit9a83836db539fd5e2026f33bee89dfd7a7c1711b
tree36189bca6eb63c2280def3217d2cffaa08be43a0
parent2cbf43b9b0429b4b09ed6f67abe56e20bcdf9f6a
parent83babf40a7ef5834f6d92ea7c6ec234ab058be66
reconcile main tree with open-source eclair