Commit Graph

2395 Commits

Author SHA1 Message Date
Romain Guy
6c884ceb0b Automated import from //branches/donutburger/...@140986,140986 2009-03-24 19:08:32 -07:00
Romain Guy
df940486a4 Automated import from //branches/master/...@140988,140988 2009-03-24 19:08:23 -07:00
Dianne Hackborn
73e5be19da Automated import from //branches/master/...@140926,140926 2009-03-24 18:57:03 -07:00
Dianne Hackborn
97f10fd56b Automated import from //branches/donutburger/...@140923,140923 2009-03-24 18:56:59 -07:00
Romain Guy
48002cd288 Automated import from //branches/master/...@140887,140887 2009-03-24 18:50:36 -07:00
Romain Guy
6443f60fc7 Automated import from //branches/donutburger/...@140885,140885 2009-03-24 18:50:12 -07:00
Eric Fischer
45829891d0 Automated import from //branches/master/...@140875,140875 2009-03-24 18:47:15 -07:00
Eric Fischer
8b532920c4 Automated import from //branches/donutburger/...@140873,140873 2009-03-24 18:46:50 -07:00
Karl Rosaen
13e3920a0f Automated import from //branches/master/...@140852,140852 2009-03-24 18:42:19 -07:00
Karl Rosaen
95e4baf51e Automated import from //branches/donutburger/...@140847,140847 2009-03-24 18:42:18 -07:00
Mathias Agopian
b24b2970a8 Automated import from //branches/donutburger/...@140807,140807 2009-03-24 18:34:22 -07:00
Mathias Agopian
b2cf954cb4 Automated import from //branches/master/...@140808,140808 2009-03-24 18:34:16 -07:00
Eric Fischer
d8b4b0d937 Automated import from //branches/cupcake/...@141866,141866 2009-03-24 18:33:42 -07:00
Eric Fischer
41bba26eed Automated import from //branches/master/...@140783,140783 2009-03-24 18:28:50 -07:00
Eric Fischer
2547afed02 Automated import from //branches/donutburger/...@140778,140778 2009-03-24 18:28:46 -07:00
Jasper Lin
2469241809 Automated import from //branches/master/...@140750,140750 2009-03-24 18:24:57 -07:00
Jasper Lin
7732336309 Automated import from //branches/donutburger/...@140749,140749 2009-03-24 18:24:57 -07:00
Jason Parekh
8b1d1e345c Automated import from //branches/master/...@140561,140561 2009-03-24 17:56:00 -07:00
Jason Parekh
de7c071e73 Automated import from //branches/donutburger/...@140559,140559 2009-03-24 17:54:03 -07:00
Mike Ritter
0859d0b631 Automated import from //branches/master/...@140419,140419 2009-03-24 17:39:14 -07:00
Mike Ritter
cb8bf488c1 Automated import from //branches/donutburger/...@140418,140418 2009-03-24 17:37:19 -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
c39a6e0c51 auto import from //branches/cupcake/...@137873 2009-03-11 12:11:56 -07:00
The Android Open Source Project
b2a3dd88a5 auto import from //branches/cupcake/...@137197 2009-03-09 11:52:12 -07:00
The Android Open Source Project
53b4045212 auto import from //depot/cupcake/@136654 2009-03-05 17:04:48 -08:00
The Android Open Source Project
b22d55b9f8 auto import from //depot/cupcake/@136620 2009-03-05 15:45:10 -08: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
15ab3eae2e auto import from //branches/cupcake/...@132569 2009-02-20 07:38:31 -08:00
The Android Open Source Project
3001a03543 auto import from //branches/cupcake/...@132276 2009-02-19 10:57:31 -08:00
The Android Open Source Project
da996f390e auto import from //branches/cupcake/...@131421 2009-02-13 12:57:50 -08:00
Adrian Taylor
625648e059 Fixing verb in permdesc_readFrameBuffer English.
There were too many verbs in this sentence. Ideally this patch should
also be applied to some of the other languages. German seems OK but
French not - and that's as far as my linguistic abilities go. I
haven't fixed the French since I'm only 99% sure I wouldn't mess it up!

I chose "read" not "use" because this permission does not allow
writing to the frame buffer; it currently only controls the
screenshotting functionality inside SurfaceFlinger.
2009-02-12 10:04:44 +00:00
The Android Open Source Project
d24b8183b9 auto import from //branches/cupcake/...@130745 2009-02-10 15:44:00 -08:00
The Android Open Source Project
f1e484acb5 auto import from //branches/cupcake/...@127436 2009-01-22 00:13:42 -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