Jean-Baptiste Queru
2a73de7b21
Merge commit 'remotes/korg/cupcake' into merge
...
Conflicts:
core/java/android/view/animation/TranslateAnimation.java
core/jni/Android.mk
core/res/res/values-en-rGB/strings.xml
libs/audioflinger/AudioFlinger.cpp
libs/surfaceflinger/LayerScreenshot.cpp
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
2009-03-18 11:33:14 -07:00
The Android Open Source Project
ba87e3e6c9
auto import from //branches/cupcake_rel/...@138607
2009-03-13 13:04:22 -07:00
The Android Open Source Project
c39a6e0c51
auto import from //branches/cupcake/...@137873
2009-03-11 12:11:56 -07:00
The Android Open Source Project
b2a3dd88a5
auto import from //branches/cupcake/...@137197
2009-03-09 11:52:12 -07:00
The Android Open Source Project
4df2423a94
auto import from //depot/cupcake/@136594
2009-03-05 14:34:35 -08:00
The Android Open Source Project
9066cfe988
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
The Android Open Source Project
d83a98f4ce
auto import from //depot/cupcake/@135843
2009-03-03 18:28:45 -08:00
The Android Open Source Project
076357b856
auto import from //depot/cupcake/@132589
2009-03-03 14:04:24 -08:00
The Android Open Source Project
3dec7d563a
auto import from //depot/cupcake/@137055
2009-03-02 22:54:33 -08:00
The Android Open Source Project
15ab3eae2e
auto import from //branches/cupcake/...@132569
2009-02-20 07:38:31 -08:00
The Android Open Source Project
3001a03543
auto import from //branches/cupcake/...@132276
2009-02-19 10:57:31 -08:00
The Android Open Source Project
da996f390e
auto import from //branches/cupcake/...@131421
2009-02-13 12:57:50 -08:00
The Android Open Source Project
d24b8183b9
auto import from //branches/cupcake/...@130745
2009-02-10 15:44:00 -08:00
Jean-Baptiste Queru
eef3c54deb
Fix 1855: Restore constants to pre-cupcake values.
...
Since some of those constants are used in the persistent database,
modifying them for cupcake meant that the new code was getting
confused by the old persistified data after an upgrade to cupcake,
teh most visible symptom being that downloads that had been initiated
from the browser would re-appear in the notifications.
2009-02-06 13:05:07 -08:00
Jean-Baptiste Queru
d816d082e1
Remove old (unused) download manager APIs
2009-02-02 15:59:47 -08:00
The Android Open Source Project
94cbba0933
Merge branch 'cupcake'
2009-01-22 00:16:08 -08:00
The Android Open Source Project
f1e484acb5
auto import from //branches/cupcake/...@127436
2009-01-22 00:13:42 -08:00
Jean-Baptiste Queru
06323a692e
Introduce new names for the download manager API fields.
...
The new names will allow for better consistency and better API
documentation if/when they're made public in the SDK.
This will be followed by a later change that removes the old names
2009-01-21 08:02:32 -08:00
The Android Open Source Project
7547115694
Merge branch 'cupcake'
2009-01-20 14:05:35 -08:00
The Android Open Source Project
22f7dfd234
auto import from //branches/cupcake/...@127101
2009-01-20 14:03:58 -08:00
android-build SharedAccount
0fda766e53
Merge branch 'cupcake'
2009-01-15 16:16:01 -08:00
The Android Open Source Project
9266c558bf
auto import from //branches/cupcake/...@126645
2009-01-15 16:12:10 -08:00
The Android Open Source Project
e570a0fa86
auto import from //branches/cupcake/...@125939
2009-01-09 18:24:37 -08:00
The Android Open Source Project
b798689749
auto import from //branches/cupcake/...@125939
2009-01-09 17:51:23 -08:00
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
