Robert Greenwalt 86994c1fc1 resolved conflicts for merge of 40717996 to master ...

Change-Id: Ie5c0f1f20c313d6c568b3b06f778f75223914ada

2011-06-24 16:10:06 -07:00

..

audioflinger

Added audio_bytes_per_sample() helper function

2011-06-17 14:19:55 -07:00

camera

Merge "Allow camera to be disabled via Device Policy Manager"

2011-06-16 01:05:43 -07:00

input

Add support for disabling pointer gestures.

2011-06-14 22:07:31 -07:00

java

resolved conflicts for merge of 40717996 to master

2011-06-24 16:10:06 -07:00

jni

VPN: make the file descriptor non-blocking by default.

2011-06-16 19:01:28 -07:00

sensorservice

cleanup Kalman filter parameters, add/fix comments/units

2011-06-13 18:47:17 -07:00

surfaceflinger

am 48294b0d: am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)

2011-06-16 18:15:19 -07:00

tests/servicestests

Persist "tagged" network stats along with UIDs.

2011-06-19 21:58:39 -07:00