Reconcile eclair and master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Feb 2010 22:38:15 +0000 (14:38 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Feb 2010 22:38:37 +0000 (14:38 -0800)
commit811da53c82bc7bdc0f998e06a198c81a98d73f3c
treebe4d74025375b0d657da51db4278a525cfaecb2b
parenta563b067b60c07b1e1dd1e127378344d3244512f
parentcda218e88757f1341d4707545a29cdc7b052e10f
Reconcile eclair and master