Gloria Wang bcf74accaf am 9580b8ce: resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp ...

Merge commit '9580b8ce6553ddde03db594fd4fd4f59ca61c382'

* commit '9580b8ce6553ddde03db594fd4fd4f59ca61c382':
  Update of DRM framework.

2010-10-10 12:51:00 -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 bb708373: am 949f7d90: Merge "Work to support switching transport streams mid-stream and signalling discontinuities to the decoder." into gingerbread

2010-10-10 11:25:54 -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

am ff04e97f: am f4619308: Merge "fix [2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread

2010-10-06 17:07:39 -07:00

tts

Update TTS plugin interface to receive engine configuration data

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

ui

am 56364bcd: am 78d15acf: Merge "Make secure views tolerate IME overlays." into gingerbread

2010-10-07 12:20:45 -07:00

utils

am bfa33b94: am f84a5918: Merge "Use pread() in ZipFileRO for Linux" into gingerbread

2010-10-05 17:02:42 -07:00