Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
152 Commits 3 Branches 0 Tags
e1861133d51b9e6a6f658eb366630ad4f4d3ff8f
Commit Graph

40 Commits

Author SHA1 Message Date
The Android Open Source Project
e1861133d5 Merge commit 'korg/cupcake' 
Conflicts:
	core/java/android/webkit/WebView.java
	core/java/android/widget/TwoLineListItem.java
	preloaded-classes
 2009-03-27 15:38:40 -07:00
Dianne Hackborn
cc95667b9c Automated import from //branches/cupcake/...@142879,142879 2009-03-26 00:04:52 -07:00
Dianne Hackborn
02771bcb5d Automated import from //branches/cupcake/...@142870,142870 2009-03-25 22:39:21 -07:00
Chris Tate
0f8fc102b9 Automated import from //branches/cupcake/...@142783,142783 2009-03-25 16:22:54 -07:00
Dianne Hackborn
2f847b9e05 Automated import from //branches/cupcake/...@142651,142651 2009-03-25 15:25:33 -07:00
Dianne Hackborn
9d4de63623 Automated import from //branches/cupcake/...@142392,142392 2009-03-24 19:37:25 -07:00
Dianne Hackborn
99c6026218 Automated import from //branches/cupcake/...@142342,142342 2009-03-24 19:27:53 -07:00
Jim Miller
2ce107ce31 Automated import from //branches/cupcake/...@142154,142154 2009-03-24 19:06:28 -07:00
Suchi Amalapurapu
7f0ed3c071 Automated import from //branches/cupcake/...@141957,141957 2009-03-24 18:43:00 -07:00
The Android Open Source Project
c2ad241504 auto import from //branches/cupcake_rel/...@141571 2009-03-19 23:08:54 -07:00
The Android Open Source Project
105925376f auto import from //branches/cupcake_rel/...@140373 2009-03-18 17:39:46 -07:00
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
f5b4b98fad auto import from //depot/cupcake/@136745 2009-03-05 20:00:43 -08: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
c474dec3ff auto import from //depot/cupcake/@135863 2009-03-04 09:49:09 -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
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
Jon Larimer
cf734f4e4e fix (more) style issues from change #5124 2008-12-09 18:17:41 -05:00
Jon Larimer
56fe6be0c3 Enforce permission for using addGpsStatusListener. Even though it's currently hidden and inaccessible from the SDK, it's still 
possible for an Android app to use, so it needs to check perms.
 2008-12-07 18:40:05 -05: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