Marc Blank cd0f12fda8 resolved conflicts for merge of 84f7d07d to master ... Change-Id: I62abe3b8aa31a1b551d0396e184b648c305033ec		2010-07-14 23:12:20 -07:00
..
src/com/android	resolved conflicts for merge of 84f7d07d to master	2010-07-14 23:12:20 -07:00
Android.mk	Remove LOCAL_SDK_VERSION. We haven't finished unbundling.	2010-02-23 12:19:55 -08:00
AndroidManifest.xml	auto import from //depot/cupcake/@135843	2009-03-03 19:32:22 -08:00