Gloria Wang 9580b8ce65 resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp ...

Change-Id: I63b00932b0f8b975da31aa9a010369db2d49fd76

2010-10-07 15:27:17 -07:00

..

android_runtime

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

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

binder

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

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

camera

Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.

2010-09-21 08:46:32 -07:00

drm

Update of DRM framework.

2010-10-04 22:14:53 +09:00

gui

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

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

media

Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.

2010-10-07 11:41:43 -07: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

Update OBB API to include callbacks

2010-09-28 17:23:26 -07:00

surfaceflinger

fix [2835280] Add support for cancelling buffers to ANativeWindow

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

tts

Update TTS plugin interface to receive engine configuration data

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

ui

Make secure views tolerate IME overlays.

2010-10-05 12:26:23 -07:00

utils

Use pread() in ZipFileRO for Linux

2010-10-04 15:17:19 -07:00