Makoto Onuki 1600adab97 Merge "Fix bug 4978035 Precondition failure: Not combined mailbox"		2011-07-01 10:19:46 -07:00
..
res/xml	Allow globals in the providers.xml	2011-03-31 14:28:43 -07:00
src/com/android	Merge "Fix bug 4978035 Precondition failure: Not combined mailbox"	2011-07-01 10:19:46 -07:00
Android.mk
AndroidManifest.xml