Jason Simmons fe48e39aeb resolved conflicts for merge of f10a5364 to ics-aah ...

Change-Id: I2d6ba86d7a1c4170a30805215ab727fbeac99726

2011-11-14 19:03:26 -08:00

..

aah_timesrv

Timesync: Improve logging and reject bad resps.

2011-10-31 16:34:24 -07:00

audioflinger

am 030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1

2011-11-14 08:40:13 -08:00

camera

Fix 5487571: Make sure shutter sound is played when it's enforced

2011-10-20 10:48:21 +08:00

input

DO NOT MERGE. Improve screenshot chord debouncing.

2011-10-12 15:05:59 -07:00

java

resolved conflicts for merge of f10a5364 to ics-aah

2011-11-14 19:03:26 -08:00

jni

am a9656df5: am f0ad147f: Merge "BatteryService(jni): properly handle read\'s return value" into ics-mr0

2011-11-01 22:34:18 +00:00

powermanager

Fix issue 4604090: notification sound interrupted.

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

sensorservice

handle EINTR when calling sensor HAL's poll function

2011-11-09 17:53:14 -08:00

surfaceflinger

Back to 59fps

2011-11-09 17:54:37 -08:00

tests/servicestests

Correct proc file reader, optimizations.

2011-11-02 15:14:11 -07:00