Kenny Root 18490fb93e resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp ...

Change-Id: Ia1a0024aabf531438203eb9fea3a10dd15eabe53

2011-04-12 10:27:15 -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

Fix for bug 4126624.

2011-03-24 13:14:02 -07:00

gui

Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildable

2011-03-31 17:40:08 -07:00

media

Fix missing AOSP copyright headers for a bunch of media framework files

2011-03-17 11:10:40 -07:00

pim

…

private

Added include/private/hwui/DrawGlInfo.h

2011-03-31 13:20:52 -07: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

…

ui

ANativeWindow: add query for the concrete type.

2011-03-14 17:47:11 -07:00

utils

resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp

2011-04-12 10:27:15 -07:00