Mathias Agopian fa6eda01a9 Merge commit 'goog/master' into merge_master ...

Conflicts:
	libs/surfaceflinger/Layer.cpp
	libs/surfaceflinger/SurfaceFlinger.cpp
	opengl/libagl/egl.cpp
	opengl/libs/EGL/egl.cpp
	opengl/libs/GLES_CM/gl.cpp
	opengl/libs/GLES_CM/gl_api.in
	opengl/libs/gl_entries.in
	opengl/libs/tools/glapigen

2009-04-30 14:43:18 -07:00

..

accounts

change the IsolatedContext to have a test version of the AccountManager that has no IBinder to the AccountManagerService.

2009-04-27 15:08:17 -07:00

annotation

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

app

am a039d46: Merge change 792 into donut

2009-04-30 11:00:07 -07:00

appwidget

AI 147732: fix broken links

2009-04-24 13:41:44 -07:00

backup

Hide the backup stuff for now

2009-04-30 12:40:19 -07:00

bluetooth

AI 143788: am: CL 143740 Don't clear supported profiles in settings app if getRemoteClass returns error.

2009-03-31 14:56:26 -07:00

content

am 487529a: First baby steps towards settings backup

2009-04-29 15:16:57 -07:00

database

am 9ae8873: Merge change 617 into donut

2009-04-29 13:41:23 -07:00

ddm

Automated import from //branches/donutburger/...@140700,140700

2009-03-24 18:15:57 -07:00

debug

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

emoji

auto import from //branches/cupcake_rel/...@140373

2009-03-18 17:39:46 -07:00

hardware

fix 1812272 SensorManager method returns hidden object

2009-04-27 18:08:10 -07:00

inputmethodservice

AI 145994: Integrate #145778 from Donut.

2009-04-13 16:11:55 -07:00

net

Add '_' to the allowable characters in a host name.

2009-04-27 16:33:36 -04:00

os

am 3eab744: Merge change 376 into donut

2009-04-29 13:35:29 -07:00

pim

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

preference

AI 145870: Add a build property for the default alarm alert. Update the various

2009-04-13 09:57:38 -07:00

provider

Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base

2009-04-29 15:16:52 -07:00

security

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

server

Add 'includeInGlobalSearch' attribute to searchable meta-data.

2009-04-29 20:23:04 +01:00

speech

AI 146615: am: CL 146613 Move Recognition service declarations to frameworks/base/core/java/android/speech. Hide them from public API by default (no changes to current.xml).

2009-04-18 22:04:01 -07:00

syncml

Automated import from //branches/master/...@142673,142673

2009-03-25 15:23:27 -07:00

test

AI 147169: am: CL 147167 am: CL 147162 Emphasize in the javadoc that the "pkg" parameters to

2009-04-21 11:54:14 -07:00

text

text: Remove references to android.util.Config

2009-04-13 17:17:21 -07:00

util

am b4c218e: AI 147994: First cut of CharsetUtils, a utility class that a

2009-04-29 23:31:38 -07:00

view

Merge commit 'goog/master' into merge_master

2009-04-30 14:43:18 -07:00

webkit

Merges p9 CLs 144856 and 145055 to GIT to enable the Database API in the browser.

2009-04-30 13:46:01 +01:00

widget

fixed two stray merge issues

2009-04-29 19:48:59 -07:00

package.html

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00