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 |
|