Dianne Hackborn aa9d84c37e resolved conflicts for merge of 05be6d6f to master ...

Change-Id: Ic6a6c5bb300f6f1d43f9ed550b284282b4f16212

2011-05-09 19:00:59 -07:00

..

am

Better compat mode part one: start scaling windows.

2011-05-09 17:03:24 -07:00

app_process

Replace a custom AndroidRuntime::findClass with a more targeted fix.

2011-04-13 16:43:15 -07:00

backup

…

bmgr

Permission fix: don't require BACKUP perm for self-restores

2010-11-16 16:57:29 -08:00

bootanimation

clear boot-animation background with black (not transparent) pixels

2011-05-06 19:22:12 -07:00

bugreport

…

dumpstate

am 67c92fbd: am 5f2ff42b: Add data to bugreports.

2011-04-29 10:26:26 -07:00

dumpsys

…

ime

…

input

Added support for full PC-style keyboards.

2010-11-18 09:49:03 -08:00

installd

Merge "Plumbing in PackageManager and installd for multi-user support."

2011-04-19 10:41:20 -07:00

keystore

Add keychain user with special keystore access permissions

2011-04-08 14:06:39 -07:00

pm

Plumbing in PackageManager and installd for multi-user support.

2011-04-15 15:15:27 -07:00

rawbu

fix int vs. pointer mismatch in return statement.

2010-11-18 14:43:36 -08:00

runtime

Replace a custom AndroidRuntime::findClass with a more targeted fix.

2011-04-13 16:43:15 -07:00

screencap

merge libsurfaceflinger_client into libgui

2011-03-25 18:42:40 -07:00

screenshot

…

service

…

servicemanager

Bug 3361124 Remove drmioserver

2011-01-20 07:50:59 -08:00

stagefright

audio/media: convert to using the audio HAL and new audio defs

2011-04-27 13:10:10 -07:00

surfaceflinger

…

svc

…

system_server

Replace a custom AndroidRuntime::findClass with a more targeted fix.

2011-04-13 16:43:15 -07:00