Commit Graph

53112 Commits

Author SHA1 Message Date
The Android Open Source Project 32d5e3fa9c Merge branch 'master' of git://android.git.kernel.org/platform/frameworks/policies/base 2009-01-16 14:41:08 -08:00
android-build SharedAccount 3eacbf8b22 Merge branch 'cupcake' 2009-01-15 16:16:04 -08:00
android-build SharedAccount 214a02e746 Merge branch 'cupcake' 2009-01-15 16:16:01 -08:00
The Android Open Source Project 8a7a67538a auto import from //branches/cupcake/...@126645 2009-01-15 16:12:10 -08:00
The Android Open Source Project 9c8e825405 auto import from //branches/cupcake/...@125939 2009-01-09 18:24:37 -08:00
The Android Open Source Project 276293246e auto import from //branches/cupcake/...@125939 2009-01-09 17:51:23 -08:00
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
Jean-Baptiste Queru 02e120bdff Merge commit 'remotes/korg/cupcake'
Conflicts:
	phone/com/android/internal/policy/impl/PhoneWindowManager.java
2008-12-19 08:05:35 -08:00
The Android Open Source Project e09fd9e819 Code drop from //branches/cupcake/...@124589 2008-12-17 18:05:43 -08:00
Android Code Review d34e59679f Merge 2008-12-10 00:39:26 +00:00
The Android Open Source Project fcfe48e7cf Initial Contribution 2008-10-21 07:00:00 -07:00
The Android Open Source Project 7c1b96a165 Initial Contribution 2008-10-21 07:00:00 -07:00