The Android Open Source Project
|
06ee417bc5
|
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 |
|
Eric Laurent
|
b1596ee235
|
Automated import from //branches/cupcake/...@142889,142889
|
2009-03-26 01:57:59 -07:00 |
|
The Android Open Source Project
|
4f68be1a5b
|
auto import from //branches/cupcake_rel/...@140373
|
2009-03-18 17:39:46 -07:00 |
|
Jean-Baptiste Queru
|
732ca39b70
|
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
|
ebad147e65
|
auto import from //branches/cupcake_rel/...@138607
|
2009-03-13 13:04:22 -07:00 |
|
The Android Open Source Project
|
bcef13b666
|
auto import from //branches/cupcake/...@137873
|
2009-03-11 12:11:56 -07:00 |
|
The Android Open Source Project
|
22f8defddc
|
auto import from //branches/cupcake/...@137197
|
2009-03-09 11:52:12 -07:00 |
|
The Android Open Source Project
|
edbf3b6af7
|
auto import from //depot/cupcake/@135843
|
2009-03-03 19:31:44 -08:00 |
|
The Android Open Source Project
|
d5193d9394
|
auto import from //depot/cupcake/@135843
|
2009-03-03 18:28:45 -08:00 |
|
James E. Blair
|
6015dfc996
|
Fix issue #1324: No audible call-waiting indication when in-call volume
is low
http://code.google.com/p/android/issues/detail?id=1324
Re-base the internally generated in-call audio volume so that it is
never muted, which is already the case for the hardware routed in-call
audio.
|
2009-03-03 16:24:40 -08:00 |
|
The Android Open Source Project
|
43aa2b1cbf
|
auto import from //depot/cupcake/@132589
|
2009-03-03 14:04:24 -08:00 |
|
The Android Open Source Project
|
0bb03408de
|
auto import from //depot/cupcake/@137055
|
2009-03-02 22:54:33 -08:00 |
|
The Android Open Source Project
|
d2bd26d326
|
auto import from //branches/cupcake/...@132276
|
2009-02-19 10:57:31 -08:00 |
|
The Android Open Source Project
|
ac65e0b172
|
auto import from //branches/cupcake/...@131421
|
2009-02-13 12:57:50 -08:00 |
|
The Android Open Source Project
|
a6938bab1f
|
auto import from //branches/cupcake/...@130745
|
2009-02-10 15:44:00 -08:00 |
|
The Android Open Source Project
|
e41dd756db
|
auto import from //branches/cupcake/...@127436
|
2009-01-22 00:13:42 -08:00 |
|
The Android Open Source Project
|
5f78a48bb8
|
auto import from //branches/cupcake/...@127101
|
2009-01-20 14:03:58 -08:00 |
|
The Android Open Source Project
|
8a7a67538a
|
auto import from //branches/cupcake/...@126645
|
2009-01-15 16:12:10 -08:00 |
|
The Android Open Source Project
|
276293246e
|
auto import from //branches/cupcake/...@125939
|
2009-01-09 17:51:23 -08:00 |
|
The Android Open Source Project
|
e09fd9e819
|
Code drop from //branches/cupcake/...@124589
|
2008-12-17 18:05:43 -08:00 |
|
The Android Open Source Project
|
7c1b96a165
|
Initial Contribution
|
2008-10-21 07:00:00 -07:00 |
|