Marc Blank ce2e1260bc am b8ef8a2c: am a97d8501: Merge "Properly decode a uid from the globalObjId in invites" into froyo ... Merge commit 'b8ef8a2c1d18421a7d537dbc8d1ea88ffca95898' into kraken * commit 'b8ef8a2c1d18421a7d537dbc8d1ea88ffca95898': Properly decode a uid from the globalObjId in invites		2010-04-15 13:48:03 -07:00
..
src/com/android	am b8ef8a2c: am a97d8501: Merge "Properly decode a uid from the globalObjId in invites" into froyo	2010-04-15 13:48:03 -07:00
Android.mk	Remove LOCAL_SDK_VERSION. We haven't finished unbundling.	2010-02-23 12:19:55 -08:00
AndroidManifest.xml