Jason Simmons 717c37944c resolved conflicts for merge of 7eeaf3f0 to ics-aah ...

Change-Id: I92b709268e22e3c3e9590c15173ab073b37db726

2012-01-24 13:16:19 -08:00

..

aah_timesrv

…

audioflinger

resolved conflicts for merge of 7eeaf3f0 to ics-aah

2012-01-24 13:16:19 -08:00

camera

Switch camera sounds to always use the system enforced audio stream.

2012-01-06 10:24:01 -08:00

input

Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)

2012-01-17 14:56:50 -08:00

java

am f449ea9e: Merge "Use the carrier-given dns addrs for tethering." into ics-mr1

2012-01-24 11:42:39 -08:00

jni

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

2011-11-15 19:19:04 -08:00

powermanager

…

sensorservice

…

surfaceflinger

SurfaceFlinger: fix layer removal race condition

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

tests/servicestests

Cherry-picking Id45abeba and Ia065dec6 for MR1

2011-12-13 14:02:32 -08:00