Andreas Huber 2e1a896724 resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp ...

Change-Id: I2f51b2120b3c552566d91a7dc498a5e8b130205f

2010-11-08 11:56:08 -08:00

..

android_runtime

Fix issue #3117918: No way to finish a native activity

2010-10-21 19:07:37 -07:00

binder

Don't propagate StrictMode over one-way Binder calls.

2010-08-31 13:16:49 -07:00

camera

Mirror the preview for front-facing cameras. do not merge

2010-10-20 18:29:18 +08:00

drm

Update of DRM framework

2010-11-02 08:06:06 +09:00

gui

Replace epoll() with poll() and rename PollLoop to Looper.

2010-09-14 01:59:45 -07:00

media

resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp

2010-11-08 11:56:08 -08:00

pim

auto import from //depot/cupcake/@135843

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

private

fix [2835280] Add support for cancelling buffers to ANativeWindow

2010-10-04 20:10:11 -07:00

storage

OBB: rearrange to be entirely asynchronous

2010-10-11 17:22:03 -07:00

surfaceflinger

addresses parts of 3096779 and 3097475

2010-10-14 14:57:34 -07:00

tts

Update TTS plugin interface to receive engine configuration data

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

ui

Drop all dispatcher state when dispatcher is disabled.

2010-10-27 18:43:51 -07:00

utils

Merge "Revert to using epoll_wait()." into gingerbread

2010-10-14 22:18:43 -07:00