Dianne Hackborn 8a7d44e824 resolved conflicts for merge of 54cb63e2 to master ...

Change-Id: I5b741a1781e3f76c03fc1534ffce871117effd10

2011-06-02 16:44:52 -07:00

..

android_runtime

Support wrapping app processes to inject debug instrumentation.

2011-05-24 12:01:25 -07:00

binder

Parcel::appendFrom({const } Parcel *parcel, size_t, size_t)

2011-04-13 10:21:56 -07:00

camera

Add auto-white balance locking to the Camera API.

2011-05-17 10:52:42 -07: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

9-axis sensor fusion with Kalman filter

2011-05-27 17:04:55 -07:00

media

Do not call getEstimatedBandwidth if the streaming is not HTTP-based

2011-06-02 10:13:52 -07:00

pim

…

private

Remove unnecessary level of priority indirection

2011-06-01 16:46:29 -07:00

storage

Add a method enable encryption.

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

surfaceflinger

frameworks/base: android_native_buffer_t -> ANativeWindowBuffer

2011-05-03 16:40:14 -07:00

ui

Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)

2011-05-25 14:37:17 -07:00

utils

resolved conflicts for merge of 54cb63e2 to master

2011-06-02 16:44:52 -07:00