| commit | cac7c56783201754c799c94549b4d96c3f081e59 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:09:38 2010 -0800 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:09:38 2010 -0800 |
| tree | 0b6fb604706672d77b9e4c7bb012fb293c9a5baa | |
| parent | 7ddd450f91dc508b26cc550f5b42fded8a731654 [diff] | |
| parent | d77f65370ea27085a10963ac3463e6f909d8c9ed [diff] |
reconcile main tree with open-source eclair
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index 29aaa3f..c87007c 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h
@@ -282,7 +282,8 @@ FORCE_BT_SCO, FORCE_BT_A2DP, FORCE_WIRED_ACCESSORY, - FORCE_BT_DOCK, + FORCE_BT_CAR_DOCK, + FORCE_BT_DESK_DOCK, NUM_FORCE_CONFIG, FORCE_DEFAULT = FORCE_NONE };