Merge branch 'open_source_no_contributions' into google_internal
authorThe Android Open Source Project <initial-contribution@android.com>
Sun, 29 Mar 2009 15:55:12 +0000 (08:55 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sun, 29 Mar 2009 15:55:12 +0000 (08:55 -0700)
commit2d80dac94db30a10f58bfe07b7cc63cc0d2007f5
tree4b825dc642cb6eb9a060e54bf8d69288fbee4904
parent93eecff876db2cf05e199d6feeea13e4e70b1b43
parent600163c2d9ebf155b75f7c47bfb9324855ba761d
Merge branch 'open_source_no_contributions' into google_internal