reconcile android-2.1_r1 snapshot
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Jan 2010 22:08:11 +0000 (14:08 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Jan 2010 22:08:11 +0000 (14:08 -0800)
commit60f020ce23833617a3fd5156ae0e477bed8b0a2e
treebfa96297c22d7442d7a8fe9f7a3c3bef9e35f398
parent945fbce14d217ce05aae77e10e86aacdcc5917e2
parente2befcd19263af93e7c922bfe29df7525d3d2878
reconcile android-2.1_r1 snapshot