Dianne Hackborn 3fe9cc5ea6 resolved conflicts for merge of e95c07bd to master ...

Change-Id: I9af0c08a9f1c1f68661efe051a66835e850b76f6

2011-06-14 16:13:26 -07:00

..

audioflinger

audio: update for audio/audio_policy header names/locations

2011-06-13 18:16:26 -07:00

camera

CameraService: return stide when dequeueing a buffer

2011-06-11 11:02:38 -07:00

input

Allow touches to slide out of the navigation bar.

2011-06-13 18:05:18 -07:00

java

resolved conflicts for merge of e95c07bd to master

2011-06-14 16:13:26 -07:00

jni

VPN: do not allow zero prefix length in routing rules.

2011-06-13 18:29:54 -07:00

sensorservice

cleanup Kalman filter parameters, add/fix comments/units

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

surfaceflinger

fix RefBase so it retains binary-compatibility with gingerbread

2011-06-13 18:39:45 -07:00

tests/servicestests

Fix test-related build breakage.

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