reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:09:33 +0000 (08:09 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:09:33 +0000 (08:09 -0800)
commite7532b6aced6424a38e5b67db8602513bdbc9883
tree2b00356cde077cec53365fd1362ac4f8424e5f22
parent60e8a3334a826bdfacb74231a343227981f2e380
parenta8af7b1f62e83fe9e63dae76d391b982824806e3
reconcile main tree with open-source eclair