Romain Guy
2bed227442
Automated import from //branches/donutburger/...@140741,140741
2009-03-24 18:23:21 -07:00
Dianne Hackborn
75898be585
Automated import from //branches/cupcake/...@141745,141745
2009-03-24 18:18:49 -07:00
Dianne Hackborn
1c9aefd471
Automated import from //branches/master/...@140719,140719
2009-03-24 18:18:28 -07:00
Dianne Hackborn
38e98fccfa
Automated import from //branches/donutburger/...@140714,140714
2009-03-24 18:18:24 -07:00
Ficus Kirkpatrick
4ad62a4538
Automated import from //branches/cupcake/...@141736,141736
2009-03-24 18:17:51 -07:00
Andy McFadden
07970839eb
Automated import from //branches/donutburger/...@140700,140700
2009-03-24 18:15:57 -07:00
Dianne Hackborn
5ba90a0c4c
Automated import from //branches/cupcake/...@141723,141723
2009-03-24 18:15:17 -07:00
Andreas Huber
4873375b2a
Automated import from //branches/cupcake/...@141708,141708
2009-03-24 18:14:23 -07:00
Eric Shienbrood
f93f02fb8a
Automated import from //branches/master/...@140680,140680
2009-03-24 18:14:17 -07:00
Eric Shienbrood
d4c5f8919b
Automated import from //branches/donutburger/...@140679,140679
2009-03-24 18:13:20 -07:00
Jean-Michel Trivi
e025d2d746
Automated import from //branches/master/...@140665,140665
2009-03-24 18:11:52 -07:00
Jean-Michel Trivi
4a5c1a7e84
Automated import from //branches/donutburger/...@140663,140663
2009-03-24 18:11:07 -07:00
Nick Pelly
610704c159
Automated import from //branches/cupcake/...@141693,141693
2009-03-24 18:10:51 -07:00
Mike Lockwood
01c3d2f24c
Automated import from //branches/master/...@140603,140603
2009-03-24 18:02:02 -07:00
Wu-cheng Li
a34bb20db5
Automated import from //branches/cupcake/...@141613,141613
2009-03-24 18:01:34 -07:00
Mike Lockwood
59f026f2dd
Automated import from //branches/donutburger/...@140601,140601
2009-03-24 18:00:38 -07:00
Bjorn Bringert
f64aff1a20
Automated import from //branches/master/...@140582,140582
2009-03-24 17:59:45 -07:00
John Wang
71b7797c26
Automated import from //branches/master/...@140575,140575
2009-03-24 17:59:06 -07:00
Jason Sams
7f1f3bb174
Automated import from //branches/cupcake/...@141597,141597
2009-03-24 17:58:31 -07:00
Jean-Michel Trivi
a5e5643d5d
Automated import from //branches/master/...@140567,140567
2009-03-24 17:57:26 -07:00
Bjorn Bringert
9e728e082e
Automated import from //branches/donutburger/...@140581,140581
2009-03-24 17:57:22 -07:00
Dave Sparks
cb9a44ed08
Automated import from //branches/cupcake/...@141591,141591
2009-03-24 17:57:12 -07:00
John Wang
bd8f907231
Automated import from //branches/donutburger/...@140572,140572
2009-03-24 17:56:28 -07:00
Jason Parekh
8b1d1e345c
Automated import from //branches/master/...@140561,140561
2009-03-24 17:56:00 -07:00
Jean-Michel Trivi
470f71f4a4
Automated import from //branches/donutburger/...@140566,140566
2009-03-24 17:55:14 -07:00
Jason Parekh
de7c071e73
Automated import from //branches/donutburger/...@140559,140559
2009-03-24 17:54:03 -07:00
Jason Parekh
3ff637187a
Automated import from //branches/master/...@140509,140509
2009-03-24 17:50:29 -07:00
Evan Millar
0ea97b8b0b
Automated import from //branches/master/...@140499,140499
2009-03-24 17:49:23 -07:00
Jason Parekh
b109615ebe
Automated import from //branches/donutburger/...@140507,140507
2009-03-24 17:48:25 -07:00
Evan Millar
811058f175
Automated import from //branches/donutburger/...@140497,140497
2009-03-24 17:47:24 -07:00
Grace Kloba
e0e37bc2b4
Automated import from //branches/master/...@140426,140426
2009-03-24 17:39:42 -07:00
Mike Ritter
0859d0b631
Automated import from //branches/master/...@140419,140419
2009-03-24 17:39:14 -07:00
Grace Kloba
ac9de62d2b
Automated import from //branches/donutburger/...@140424,140424
2009-03-24 17:37:48 -07:00
Mike Ritter
cb8bf488c1
Automated import from //branches/donutburger/...@140418,140418
2009-03-24 17:37:19 -07:00
Android Code Review
d91450e116
Merge
2009-03-23 15:26:38 -07:00
Android Code Review
4f638e9f08
Merge
2009-03-23 15:25:59 -07:00
Jean-Baptiste Queru
680f8c77d5
Deal better with situations where OpenCORE is disabled.
2009-03-23 12:00:23 -07:00
Scott Tsai
8a2b9083e3
localize: include <cstdio> in files that uses the printf family of
...
functions to make the code build on gcc-4.4
gcc-4.4 further cleaned up header include dependencies so that e.x.
including <iostream> no longer pulls in printf.
2009-03-21 08:08:36 +08:00
Scott Tsai
bfc9f4f830
Include stdio.h in tools/aidl/AST.h to make the code build on gcc-4.4
2009-03-21 07:06:07 +08:00
The Android Open Source Project
092639eccf
auto import from //branches/cupcake_rel/...@141571
2009-03-19 23:08:56 -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
1126766d76
auto import from //branches/cupcake_rel/...@140373
2009-03-18 17:39:47 -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
Jean-Baptiste Queru
42e48026b2
Revert "Add support for camera preview to be in overlay surfaces."
...
This reverts commit c35feb106e8ded282a261ae89075361ae5dc4214.
2009-03-18 11:08:56 -07:00
Jean-Baptiste Queru
251edb3b0c
Merge commit 'remotes/korg/cupcake' into merge
2009-03-17 16:08:44 -07:00
The Android Open Source Project
d06b097626
auto import from //branches/cupcake_rel/...@138607
2009-03-13 13:04:23 -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
0727d22ece
auto import from //branches/cupcake/...@137873
2009-03-11 12:11:58 -07:00
