Jason Simmons 8d3538d016 resolved conflicts for merge of 0799e951 to ics-aah ...

Change-Id: I4f968fa84aa395c63c28053ef0f489161530bf86

2011-09-20 14:36:22 -07:00

..

aah_timesrv

Reintroduce a line of code which disappeared during reformatting.

2011-08-29 13:09:24 -07:00

audioflinger

am 9404e1fb: Merge "AudioResampler: use relative instead of absolute labels"

2011-09-16 13:57:35 -07:00

camera

Add video snapshot camera parameter.

2011-09-01 13:37:14 +08:00

input

Adjust layers for system overlays.

2011-09-08 18:53:42 -07:00

java

resolved conflicts for merge of 0799e951 to ics-aah

2011-09-20 14:36:22 -07:00

jni

am 9d4bc852: Merge "Fix input channel leak. Bug: 5156144"

2011-08-31 13:03:26 -07:00

powermanager

Fix issue 4604090: notification sound interrupted.

2011-07-25 18:41:12 -07:00

sensorservice

improve sensorservice dumpsys

2011-09-14 16:43:34 -07:00

surfaceflinger

SurfaceFlinger: fix isOpaque check in lockPageFlip

2011-09-14 18:23:37 -07:00

tests/servicestests

Sample atomic network stats buckets, full poll.

2011-09-18 16:27:21 -07:00