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 |
|
Mathias Agopian
|
3a186c7c2e
|
Automated import from //branches/cupcake/...@142875,142875
|
2009-03-25 23:26:39 -07:00 |
|
Mathias Agopian
|
c75c4364ea
|
Automated import from //branches/cupcake/...@142873,142873
|
2009-03-25 23:18:56 -07:00 |
|
Mathias Agopian
|
d2f34e5fd6
|
Automated import from //branches/cupcake/...@142856,142856
|
2009-03-25 21:42:35 -07:00 |
|
Mathias Agopian
|
e94fa1ba1d
|
Automated import from //branches/cupcake/...@142445,142445
|
2009-03-24 19:43:24 -07:00 |
|
Mathias Agopian
|
ec4faffff3
|
Automated import from //branches/cupcake/...@142427,142427
|
2009-03-24 19:41:37 -07:00 |
|
The Android Open Source Project
|
c2ad241504
|
auto import from //branches/cupcake_rel/...@141571
|
2009-03-19 23:08:54 -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
|
c39a6e0c51
|
auto import from //branches/cupcake/...@137873
|
2009-03-11 12:11:56 -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 |
|
Adrian Taylor
|
efd826e911
|
Fixing LayerScreenshot bitmap config value.
|
2009-03-02 12:11:47 -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
|
2076373275
|
Add missing <limits.h> include
This should fix the build for gcc 4.3.2
|
2009-01-26 12:11:20 -08:00 |
|
The Android Open Source Project
|
22f7dfd234
|
auto import from //branches/cupcake/...@127101
|
2009-01-20 14:03:58 -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
|
b798689749
|
auto import from //branches/cupcake/...@125939
|
2009-01-09 17:51:23 -08:00 |
|
The Android Open Source Project
|
f013e1afd1
|
Code drop from //branches/cupcake/...@124589
|
2008-12-17 18:05:43 -08:00 |
|
The Android Open Source Project
|
54b6cfa9a9
|
Initial Contribution
|
2008-10-21 07:00:00 -07:00 |
|