reconcile android-2.1_r1 snapshot
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Jan 2010 22:07:48 +0000 (14:07 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Jan 2010 22:07:48 +0000 (14:07 -0800)
commita8af7b1f62e83fe9e63dae76d391b982824806e3
tree2b00356cde077cec53365fd1362ac4f8424e5f22
parent60e8a3334a826bdfacb74231a343227981f2e380
parent2f92adf6d4aafdf771ce2346f418d226eb9936bb
reconcile android-2.1_r1 snapshot