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
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
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
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
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
Tom Gibara
24847f3517
Fix for bug 1185.
...
The constructor IntentFilter(String action, String dataType) ignores the action parameter.
This change ensures that it is correctly added to the set of actions.
2008-11-04 02:25:42 +00:00
Jean-Baptiste Queru
1ef4564d4a
Change values of ACTION_POWER constants to better match established practice.
...
Trim code to 100 lines to match style guide.
2008-10-24 11:49:25 -07:00
Cliff Spradlin
fda6fae156
Added broadcasts for external power events.
2008-10-23 10:24:41 -07:00
The Android Open Source Project
54b6cfa9a9
Initial Contribution
2008-10-21 07:00:00 -07:00
