Jean-Baptiste Queru
|
e1dc1d6dc8
|
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 |
|
The Android Open Source Project
|
f013e1afd1
|
Code drop from //branches/cupcake/...@124589
|
2008-12-17 18:05:43 -08:00 |
|
Evan JIANG
|
ae499953ce
|
Fix issue 1164: Incorrect organization type label in contacts
http://code.google.com/p/android/issues/detail?id=1164
The organization definition in string-array resource is different from
android.provider.Contacts.OrganizationColumns
|
2008-11-02 09:47:52 +08:00 |
|
The Android Open Source Project
|
54b6cfa9a9
|
Initial Contribution
|
2008-10-21 07:00:00 -07:00 |
|