Andrew Stadler 0813c7051f resolved conflicts for merge of 0d9ed341 to master ... Change-Id: I198f760ef1734cf4a64c875236a2352859dc1a72		2010-09-22 14:37:44 -07:00
..
src/com/android	resolved conflicts for merge of 0d9ed341 to master	2010-09-22 14:37:44 -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