Jason Simmons 0d77f84d0c Merge "Add an option that disables the AUDIO_BECOMING_NOISY intent send when a headset is hotplugged." into ics-aah

2011-12-07 14:36:39 -08:00

..

java

am 0a361b10: Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)" into ics-mr1

2011-12-07 14:35:59 -08:00

jni

am 1e994211: Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1

2011-12-07 11:02:58 -08:00

res

Merge "Add an option that disables the AUDIO_BECOMING_NOISY intent send when a headset is hotplugged." into ics-aah

2011-12-07 14:36:39 -08:00

tests

Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1

2011-12-05 15:52:34 -08:00