Kenny Root 0a9b54e88b resolved conflicts for merge of 8bb7a1df to master ...

Change-Id: Ieec036f494a54eab74a27b954d1423bf981dd3f9

2010-10-13 15:43:51 -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

0-memcpy video recording framework

2010-10-07 02:09:03 -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

am 2b4f1f4c: am f72dd019: Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread

2010-10-10 17:14:53 -07:00

pim

…

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

Always create OpenGL accelerated windows in RGBA 8888.

2010-10-12 11:00:18 -07:00

tts

…

ui

Track input state when transferring touch focus.

2010-10-11 18:32:20 -07:00

utils

am 22cb4ef8: am d577cfd7: Merge "Switch Looper back to using poll() instead of epoll()." into gingerbread

2010-10-10 12:52:40 -07:00