reconcile android-2.1_r1 snapshot
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Jan 2010 22:09:00 +0000 (14:09 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Jan 2010 22:09:00 +0000 (14:09 -0800)
commit75a0f6d0123c2ee125596575476c4e84d674fa80
tree2322ca9650119da959e1811646b04f43732ea990
parent602f6390d4f5b7105aa5869193af5bd09550e8dd
parent170bf148ffde9ebd7ebedc939085ffa1b3113805
reconcile android-2.1_r1 snapshot