am 2aee7c18: Merge "Revert "Add config resource to help ATT prepaid"" into jb-mr1-dev

* commit '2aee7c1843670f5b7a81261079ad0eb1e4ebb9ef':
  Revert "Add config resource to help ATT prepaid"
This commit is contained in:
Baligh Uddin
2012-10-09 17:56:45 -07:00
committed by Android Git Automerger
2 changed files with 0 additions and 6 deletions

View File

@@ -988,9 +988,4 @@
<!-- Whether camera shutter sound is forced or not (country specific). --> <!-- Whether camera shutter sound is forced or not (country specific). -->
<bool name="config_camera_sound_forced">false</bool> <bool name="config_camera_sound_forced">false</bool>
<!-- Set to true if we need to not prefer an APN.
This is being added to enable a simple scenario of pre-paid
provisioning on some carriers, working around a bug (7305641)
where if the preferred is used we don't try the others. -->
<bool name="config_dontPreferApn">false</bool>
</resources> </resources>

View File

@@ -276,7 +276,6 @@
<java-symbol type="bool" name="config_useDevInputEventForAudioJack" /> <java-symbol type="bool" name="config_useDevInputEventForAudioJack" />
<java-symbol type="bool" name="config_safe_media_volume_enabled" /> <java-symbol type="bool" name="config_safe_media_volume_enabled" />
<java-symbol type="bool" name="config_camera_sound_forced" /> <java-symbol type="bool" name="config_camera_sound_forced" />
<java-symbol type="bool" name="config_dontPreferApn" />
<java-symbol type="integer" name="config_cursorWindowSize" /> <java-symbol type="integer" name="config_cursorWindowSize" />
<java-symbol type="integer" name="config_longPressOnPowerBehavior" /> <java-symbol type="integer" name="config_longPressOnPowerBehavior" />