Marc Blank 4e619a2d50 am 2b2b3448: Handle inactivity timeout > maximum allowed properly ... Merge commit '2b2b3448ec200f3d649e5f57309908d28ce3bfc7' into gingerbread * commit '2b2b3448ec200f3d649e5f57309908d28ce3bfc7': Handle inactivity timeout > maximum allowed properly		2010-08-02 20:41:55 -07:00
..
src/com/android	am 2b2b3448: Handle inactivity timeout > maximum allowed properly	2010-08-02 20:41:55 -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