Mathias Agopian a5ab8ce602 resolved conflicts for merge of 48a86240 to master ...

Change-Id: I2305fef9f4dd46183337217d822df3c675b6b6e5

2010-09-15 12:29:18 -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

Added command type to play recording sound.

2010-09-14 16:49:08 -07:00

drm

Initial contribution from Sony Corporation.

2010-09-01 15:40:00 +09:00

gui

Added SensorManager.getMinDelay()

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

media

Media scanner support for tracking files of arbitrary type.

2010-09-12 23:21:44 -04: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 logging of various important graphics events

2010-09-13 23:16:58 -07:00

utils

am 0f0541e4: am b88102f5: Input dispatcher ANR handling enhancements.

2010-09-12 17:15:19 -07:00