Commit Graph

12 Commits

Author SHA1 Message Date
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