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 |
|
Dave Sparks
|
ba9844ee12
|
AI 143127: Media recorder service requires android.permission.CAMERA to record video
BUG=1742392
Automated import of CL 143127
|
2009-03-27 12:57:40 -07:00 |
|
Dave Sparks
|
6ee2e78e1c
|
Automated import from //branches/donutburger/...@141593,141593
|
2009-03-24 20:35:44 -07:00 |
|
Dave Sparks
|
cb9a44ed08
|
Automated import from //branches/cupcake/...@141591,141591
|
2009-03-24 17:57:12 -07:00 |
|
Jean-Baptiste Queru
|
680f8c77d5
|
Deal better with situations where OpenCORE is disabled.
|
2009-03-23 12:00:23 -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
|
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
|
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 |
|