The Android Open Source Project cfe5cdd3a1 manual merge d90a331 to avoid conflicts ...

Merge commit 'd90a331'

2009-05-06 18:16:52 -07:00

..

src

manual merge d90a331 to avoid conflicts

2009-05-06 18:16:52 -07:00

Android.mk

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

AndroidManifest.xml

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00