reconcile android-2.1_r1 snapshot
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Jan 2010 22:09:21 +0000 (14:09 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Jan 2010 22:09:21 +0000 (14:09 -0800)
commit18cb504e8f273911906805edae071b59e315d294
tree45d50a13572b9c4e47fc5025c4450cab9fc03a03
parent9616fc15195c4670c8b513bc6b8cd1f08469d086
parentdae83f9df1a832def8c44629dabf749049619eff
reconcile android-2.1_r1 snapshot