Derek Sollenberger a30ed30b75 resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp ...

Change-Id: Iebde13c41a2adf4e693d87e808cb0659f913e4e6

2011-07-29 14:16:18 -04: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

DO NOT MERGE

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

gui

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

2011-07-29 14:16:18 -04: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

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

Tweaks for forward-compatibility

2011-06-18 09:42:04 -07:00

utils

DO NOT MERGE. may fix build on some version of gcc

2011-07-27 11:31:57 -07:00