Kenny Root bff405f910 resolved conflicts for merge of d8e8186c to master ...

Change-Id: Ica3f6cd958717ea7033cab8b4bf9cd3425c1e1c5

2010-09-28 18:16:50 -07:00

..

android_runtime

am 14bc6b5d: am 09340a4b: Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread

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

Fix the CameraHardwareInterface::setPreviewWindow comment.

2010-09-25 17:58:15 -07:00

drm

Initial contribution from Sony Corporation.

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

gui

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

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

media

am d6c30e8c: am be045061: Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens." into gingerbread

2010-09-28 14:01:14 -07:00

pim

auto import from //depot/cupcake/@135843

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

private

fix a race in SF buffer management

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

storage

Update OBB API to include callbacks

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

surfaceflinger

am 495ad4f2: am beabe75a: Merge changes I1f7c4535,I741c68a2 into gingerbread

2010-09-24 18:13:22 -07:00

tts

Update TTS plugin interface to receive engine configuration data

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

ui

Add support for transferring touch focus.

2010-09-27 16:10:17 -07:00

utils

am 9785bf0f: am 14a288da: Merge "Add suuport for splitting touch events across windows." into gingerbread

2010-09-27 14:40:38 -07:00