Jean-Baptiste Queru 3d6b009db1 am 09f1e2b2: resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aosp ...

Merge commit '09f1e2b2151ea18c05b9138a0a5cb63af18ea373'

* commit '09f1e2b2151ea18c05b9138a0a5cb63af18ea373':
  Initial contribution from Sony Corporation.

2010-09-10 11:29:10 -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

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

am 306cd58d: am d353c840: Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread

2010-09-08 17:57:56 -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

…

ui

Fix key repeat delay.

2010-09-08 12:28:43 -07:00

utils

Merge "Purge Skia objects from GL caches as needed."

2010-09-08 18:06:11 -07:00