Mihai Preda a9576bdad6 resolved conflicts for merge of 7403a54738 to donut		2009-06-08 20:52:12 +02:00
..
src/com/android/email	resolved conflicts for merge of 7403a54738 to donut	2009-06-08 20:52:12 +02:00
Android.mk	auto import from //depot/cupcake/@135843	2009-03-03 19:32:22 -08:00
AndroidManifest.xml	auto import from //depot/cupcake/@135843	2009-03-03 19:32:22 -08:00