Commit Graph

8 Commits

Author SHA1 Message Date
The Android Open Source Project
106f3a4aed Merge commit 'korg/cupcake' 2009-04-14 18:18:15 -07:00
The Android Open Source Project
556c28a2cd Merge commit 'korg/cupcake' 2009-03-27 15:31:11 -07:00
Jean-Baptiste Queru
2936ad176e Merge commit 'remotes/korg/cupcake' into merge 2009-03-17 16:08:44 -07:00
The Android Open Source Project
f646e8621a Merge branch 'cupcake' 2009-01-22 00:16:10 -08:00
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
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
fcfe48e7cf Initial Contribution 2008-10-21 07:00:00 -07:00