commit a0941d2c81f24e81e666055bda3d56db31b6ac6b
author The Android Automerger <android-build@android.com> Tue Oct 09 16:07:28 2012 -0700
committer The Android Automerger <android-build@android.com> Tue Oct 09 16:07:28 2012 -0700
tree b503aec76e85d7ce931272c08b5f2e3f4704e869
parent fb2f28271b79b1725cc52e6620bf17c4e94d38cd
parent bd0816f54b7041ac367a40ce2b6a5d1a691831f5

merge in jb-mr1-release history after reset to jb-mr1-dev

include/system/audio_policy.h

diff --git a/include/system/audio_policy.h b/include/system/audio_policy.h
index 6b49a80..7b82d8d 100644
--- a/include/system/audio_policy.h
+++ b/include/system/audio_policy.h
@@ -44,7 +44,6 @@
     AUDIO_POLICY_FORCE_DIGITAL_DOCK,
     AUDIO_POLICY_FORCE_NO_BT_A2DP, /* A2DP sink is not preferred to speaker or wired HS */
     AUDIO_POLICY_FORCE_REMOTE_SUBMIX,
-    AUDIO_POLICY_FORCE_SYSTEM_ENFORCED,
 
     AUDIO_POLICY_FORCE_CFG_CNT,
     AUDIO_POLICY_FORCE_CFG_MAX = AUDIO_POLICY_FORCE_CFG_CNT - 1,
@@ -58,7 +57,6 @@
     AUDIO_POLICY_FORCE_FOR_MEDIA,
     AUDIO_POLICY_FORCE_FOR_RECORD,
     AUDIO_POLICY_FORCE_FOR_DOCK,
-    AUDIO_POLICY_FORCE_FOR_SYSTEM,
 
     AUDIO_POLICY_FORCE_USE_CNT,
     AUDIO_POLICY_FORCE_USE_MAX = AUDIO_POLICY_FORCE_USE_CNT - 1,