Marco Nelissen b2fd84ad1d resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp ...

Change-Id: I1d86ea56b3d1d1b69f6671e5b0df0ca3f0c79643

2011-06-06 09:55: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

…

drm

DO NOT MERGE

2011-05-13 15:09:24 -07:00

gui

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

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

media

am 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2

2011-05-18 09:30:01 -07:00

pim

…

private

Added include/private/hwui/DrawGlInfo.h

2011-03-31 13:20:52 -07:00

storage

…

surfaceflinger

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

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

tts

…

ui

Implement pointer acceleration.

2011-06-02 14:12:05 -07:00

utils

resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp

2011-06-06 09:55:15 -07:00