Jianhong Jiang
|
3ca47d101d
|
Squashed commit of the following:
commit b6cf47306b642f7cf7e1b55cce448e0deff38f36
Author: Jianhong Jiang <jianhong@google.com>
Date: Mon Apr 13 11:07:01 2009 -0700
Change tabs into 4 spaces.
commit 93c5890dbcc68e37aa0ef039b4a203acddca8968
Author: Jianhong Jiang <jianhong@google.com>
Date: Fri Apr 10 14:15:23 2009 -0700
OpenCore 2.02 related changes.
|
2009-04-13 19:01:51 -07:00 |
|
Jean-Baptiste Queru
|
bb038d1604
|
Revert "Changes required to accommodate OpenCORE 2.0"
This reverts commit ea780b689f8ee3dff355deab2434bbd4ae04d208.
Conflicts:
media/libmediaplayerservice/Android.mk
|
2009-04-08 14:40:48 -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 |
|
Jean-Baptiste Queru
|
680f8c77d5
|
Deal better with situations where OpenCORE is disabled.
|
2009-03-23 12:00:23 -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
|
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
|
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 |
|
Brock Atchison
|
ea780b689f
|
Changes required to accommodate OpenCORE 2.0
|
2009-01-21 19:00:25 -06: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 |
|