Go to file
Jean-Baptiste Queru 772a89695f Merge commit 'remotes/korg/cupcake'
Conflicts:
	core/java/com/android/internal/app/AlertController.java
	core/res/res/values/strings.xml
	media/java/android/media/AudioSystem.java
	services/java/com/android/server/LocationManagerService.java
2008-12-19 08:31:54 -08:00
awt Code drop from //branches/cupcake/...@124589 2008-12-17 18:05:43 -08:00
camera/libcameraservice Code drop from //branches/cupcake/...@124589 2008-12-17 18:05:43 -08:00
cmds Initial Contribution 2008-10-21 07:00:00 -07:00
im/java/android/im Code drop from //branches/cupcake/...@124589 2008-12-17 18:05:43 -08:00
include Code drop from //branches/cupcake/...@124589 2008-12-17 18:05:43 -08:00
libs Code drop from //branches/cupcake/...@124589 2008-12-17 18:05:43 -08:00
opengl Code drop from //branches/cupcake/...@124589 2008-12-17 18:05:43 -08:00
services Initial Contribution 2008-10-21 07:00:00 -07:00
MODULE_LICENSE_APACHE2 Initial Contribution 2008-10-21 07:00:00 -07:00
NOTICE Initial Contribution 2008-10-21 07:00:00 -07:00