Jason Simmons 3b282fae37 resolved conflicts for merge of 0c0120ef to ics-aah ...

Change-Id: If1f39ff160b4305ef057d50bb1f01d2c45f1579d

2011-12-06 11:11:13 -08:00

..

aah_timesrv

Timesync: Improve logging and reject bad resps.

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

audioflinger

Merge "AudioFlinger: Make StandbyTime configurable." into ics-aah

2011-12-06 10:04:38 -08:00

camera

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

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

input

Eliminate hw.keyboards system properties.

2011-11-15 18:00:10 -08:00

java

resolved conflicts for merge of 0c0120ef to ics-aah

2011-12-06 11:11:13 -08:00

jni

am 3e7497b4: Merge "Eliminate hw.keyboards system properties." into ics-mr1

2011-11-15 19:19:04 -08: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

SurfaceFlinger: fix layer removal race condition

2011-12-02 10:03:25 -08:00

tests/servicestests

Only write network stats when already loaded.

2011-11-17 12:05:46 -08:00