Matthew Xie cf5cecd854 am 1890fa82: am 79d84930: Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1 ...

* commit '1890fa822091ea700b7409ac79a57cf650b55003':
  Set Bluetooth adapter to PowerOff mode when turnoff with airplane on

2012-01-12 11:29:39 -08:00

..

java

am 1890fa82: am 79d84930: Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1

2012-01-12 11:29:39 -08:00

jni

Merge "Use audio_format_t consistently"

2012-01-12 10:30:28 -08:00

res

DO NOT MERGE cherry-picked FU framework tablet commits

2012-01-09 16:22:12 -05:00

tests

am 87badc20: am 4ac4ab4e: Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922" into ics-mr1

2012-01-11 17:57:16 -08:00