Tom Taylor 240f0ea1cf resolved conflicts for merge of ad2fa35d to master ... Change-Id: Ia4362cd48ac0689b91003943a4cd9660da72ff90		2009-12-22 10:11:55 -08:00
awt	Removed system/framework/android.awt.jar.	2009-07-02 14:11:33 -05:00
calendar	Generate a calendar static Java library.	2009-12-01 17:42:41 -08:00
camera	Add missing library in linker option. Currently the library is used by the	2009-12-09 16:32:04 -08:00
cmds	keystore: Add paddings before checksumming.	2009-12-22 17:26:42 +08:00
common	Move various utility classes to android-common	2009-12-18 10:08:35 -08:00
include	Add string resource type inspection	2009-12-10 14:22:08 -08:00
libs	am f9b0e826: fix [2269582] [TOP-10][Passion_1506][APT:Camera]Sometimes camera preview screen is truncated after launching and back to home screen by home key repeatedly	2009-12-11 01:16:08 -08:00
opengl	Merge change I5ddc721d	2009-12-09 16:07:57 -08:00
vpn/java/android/net/vpn	Fix broken build.	2009-11-25 12:49:24 +08:00
cleanspec.mk	Rename [I]DropBox[Service] to [I]DropBoxManager[Service].	2009-11-12 13:58:27 -08:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	Start using CLDR for some date-and-time strings and formats.	2009-05-15 10:15:50 -07:00