Jeff Brown b380c4d7ed resolved conflicts for merge of a05088c1 to master ...

Change-Id: I7973f9f28586dec9b9659f8f662f40db7997a521

2010-09-08 13:02:55 -07:00

..

android_runtime

am a1205f07: am 2d3739d4: Merge "Modify native ALooper to take an explicit ident." into gingerbread

2010-09-07 18:52:06 -07:00

binder

am ae087369: am 63070856: Merge "Don\'t propagate StrictMode over one-way Binder calls." into gingerbread

2010-08-31 15:06:24 -07:00

camera

am 6e46e6f7: am 7ec7b997: Remove camera metering mode API.

2010-08-30 14:06:16 -07:00

gui

Added SensorManager.getMinDelay()

2010-07-29 18:18:00 -07:00

media

Merge changes I71f5b0fc,I92c7accb

2010-09-03 17:14:51 -07:00

pim

…

private

fix a race in SF buffer management

2010-08-26 17:42:27 -07:00

storage

Reorganize MountService IPC

2010-08-20 13:17:12 -07:00

surfaceflinger

am bc4389ed: am 8395b462: Merge "fix [2931513] Add support for setting the orientation of an ANativeWindow" into gingerbread

2010-08-24 17:56:40 -07:00

tts

Update TTS plugin interface to receive engine configuration data

2010-03-18 11:52:41 -07:00

ui

Add support for secure views.

2010-09-08 11:50:55 -07:00

utils

Modify native ALooper to take an explicit ident.

2010-09-07 15:46:55 -07:00