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

54 Commits

Author SHA1 Message Date
The Android Open Source Project
d3af727927 Merge branch 'readonly-p4-master' 
Conflicts:

	telephony/java/com/android/internal/telephony/gsm/RIL.java
  resolved by removing gsm/RIL.java
 2009-04-02 12:18:20 -07:00
Wink Saville
04e71b3db8 AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger. 
Automated import of CL 144245
 2009-04-02 11:00:54 -07:00
Romain Guy
aaf25b5a66 Merge branch 'readonly-p4-master' 2009-04-02 09:20:36 -07:00
Romain Guy
7fb60b9b4e AI 144080: No need to merge. Fix the build. 
Automated import of CL 144080
 2009-04-02 09:19:22 -07:00
The Android Open Source Project
762d30a313 Merge branch 'open_source' into google_internal 
Conflicts:
	core/java/android/widget/TwoLineListItem.java
	core/res/res/values/public.xml
	preloaded-classes
 2009-03-29 08:55:27 -07:00
Jean-Baptiste Queru
bf62297bd1 AI 143296: Merge from donut Change 143147 
Automated import of CL 143296
 2009-03-27 17:43:53 -07:00
Ed Heyl
a2debb356d AI 143278: Merge 142826: Add tutorial to platform. The tutorial can be launched with the new Intent ACTION_SYSTEM_TUTORIAL and 
is available through Settings->About->System Tutorial

Automated import of CL 143278
 2009-03-27 16:52:45 -07:00
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
Amith Yamasani
a565e5e3d0 Automated import from //branches/master/...@142936,142936 2009-03-26 10:19:09 -07:00
Dianne Hackborn
73fbd70263 Automated import from //branches/cupcake/...@142829,142829 2009-03-25 18:37:33 -07:00
Jim Miller
7e4ad35590 Automated import from //branches/cupcake/...@142825,142825 2009-03-25 18:16:41 -07:00
Amith Yamasani
2d548b56cd Automated import from //branches/cupcake/...@142786,142786 2009-03-25 16:26:35 -07:00
Jack Palevich
a605a51e63 Automated import from //branches/master/...@142658,142658 2009-03-25 15:16:50 -07:00
Dianne Hackborn
15ba27802e Automated import from //branches/master/...@142576,142576 2009-03-25 15:09:04 -07:00
Jean-Baptiste Queru
8b0662878e Automated import from //branches/master/...@142574,142574 2009-03-25 15:05:51 -07:00
Fred Quintana
603073430b Automated import from //branches/master/...@142414,142414 2009-03-24 22:48:12 -07:00
Jack Palevich
50fd2b9ef2 Automated import from //branches/cupcake/...@142485,142485 2009-03-24 20:22:54 -07:00
Niko Catania
a06f6e328d Automated import from //branches/master/...@141214,141214 2009-03-24 19:50:50 -07:00
Dianne Hackborn
ca783b947a Automated import from //branches/cupcake/...@142471,142471 2009-03-24 19:47:09 -07:00
Jeff Hamilton
2c6b3b0c26 Automated import from //branches/master/...@141107,141107 2009-03-24 19:32:26 -07:00
Dianne Hackborn
51bf077883 Automated import from //branches/master/...@141004,141004 2009-03-24 19:11:41 -07:00
Dianne Hackborn
73e5be19da Automated import from //branches/master/...@140926,140926 2009-03-24 18:57:03 -07:00
Dianne Hackborn
04750b6b43 Automated import from //branches/master/...@140830,140830 2009-03-24 18:38:23 -07:00
Niko Catania
70322464af Automated import from //branches/master/...@140812,140812 2009-03-24 18:35:07 -07:00
Dianne Hackborn
1c9aefd471 Automated import from //branches/master/...@140719,140719 2009-03-24 18:18:28 -07:00
Jean-Michel Trivi
a5e5643d5d Automated import from //branches/master/...@140567,140567 2009-03-24 17:57:26 -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
7b0b1ed979 auto import //branches/master/...@140412 2009-03-18 22:20:26 -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
b22d55b9f8 auto import from //depot/cupcake/@136620 2009-03-05 15:45:10 -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
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
Mike Hearn
adcd2ed8d2 Add some documentation to WebView, WebSettings and CookieSyncManager. 
Double-tree rendering is deprecated.
 2009-01-29 08:40:33 -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