Gloria Wang 09ba5cebb2 resolved conflicts for merge of c761a80d to master ...

Change-Id: I0c0474b95d66c23310d04b7a7f4c9571a211582c

2011-03-14 11:56:39 -07:00

..

android_runtime

Bug 3515073 Add ANativeWindow_fromSurfaceTexture

2011-03-04 16:39:29 -08:00

binder

Binder linkage no longer depends on JNI objrefs as persistent tokens

2011-02-28 11:37:20 -08:00

camera

Merge "Add YV12 preview format to camera parameter constants."

2011-02-24 02:51:17 -08:00

diskusage

Move disk usage utilities to its own library

2010-11-30 16:51:13 -08:00

drm

resolved conflicts for merge of c761a80d to master

2011-03-14 11:56:39 -07:00

gui

Add the MIN_UNDEQUEUED_BUFFERS query to ANW.

2011-02-28 12:24:40 -08:00

media

am 055066e1: am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeycomb-mr1

2011-03-11 08:46:40 -08:00

pim

…

private

Fix issue 3439872: video chat and bluetooth SCO

2011-03-08 16:33:15 -08:00

storage

Add a method enable encryption.

2011-01-12 16:00:23 -06:00

surfaceflinger

ANativeWindow: add queues-to-window-composer check.

2011-03-08 16:49:51 -08:00

tts

Update TTS plugin interface to receive engine configuration data

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

ui

Input improvements and bug fixes.

2011-03-09 18:30:28 -08:00

utils

am d00353fe: am bc8a8e8c: Merge "Add support for partial invalidates in WebView Bug #3461349" into honeycomb-mr1

2011-03-07 22:45:52 -08:00