Kenny Root 461fa8b05d resolved conflicts for merge of 18490fb9 to master ...

Change-Id: I6c68e6fb0f9c1182a955689bbffc161a8f30bd37

2011-04-12 12:51:08 -07:00

..

android_runtime

You don't need to poke around inside FileDescriptor manually.

2011-04-11 17:04:01 -07:00

binder

Binder linkage no longer depends on JNI objrefs as persistent tokens

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

camera

Add camera focus area API.

2011-04-08 17:45:15 +08:00

diskusage

Move disk usage utilities to its own library

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

drm

am ed7b688c: am aac43ea1: am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1

2011-03-25 10:11:49 -07:00

gui

SurfaceTexture can now force the client to request a buffer

2011-04-01 14:43:35 -07:00

media

Merge "Miscellaneous code cleanup in audio framework"

2011-04-06 13:03:11 -07:00

pim

…

private

New fix for issue 4111672: control block flags

2011-04-05 12:05:41 -07:00

storage

Add a method enable encryption.

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

surfaceflinger

remove more unused references to ISurface

2011-04-05 20:11:55 -07:00

tts

…

ui

Merge "Add a little input event consistency verifier."

2011-04-01 12:56:35 -07:00

utils

resolved conflicts for merge of 18490fb9 to master

2011-04-12 12:51:08 -07:00