Revert "add MotoWrigley3GRIL"

This reverts commit 59b968ef747defbaa1f7add37bc3dc553fbf1208.

Change-Id: I97ebd59be33607f15e37a1c5b428762fb436e721
Revert "Support for Virgin Mobile MMS."

This reverts commit 7d445c52fa3a2fb274232f6eefc95c99866e9bf2.

Change-Id: I3e782802874250aff5fcfd3965872729d9860180
Revert "tether down: mTetherInterfaceName vs mInterfaceName mismatch"

This reverts commit 29329d7b1a58b8e946bec37da3eda0d61daaa3ee.

Change-Id: I5c454376d1e55570b473bb335fdfd50411bb3003
Revert "Get SoftAP interface from wifi.ap.interface prop"

This reverts commit 98446e0bf59eff519ef3400d5504eaf72b74196d.

Change-Id: I66129ed0bb5102a13f56d2d03e7afb2053107375
Revert "Added NFC Reader support for two new tag types:  ISO PCD type A and ISO PCD type B"

This reverts commit 592b452de628c7a786d9d3a40d526970c1869101.

Change-Id: I5ede7f44ec66aa22cf97169bc5e5f6350f78cc9f
Revert "set dns correctly for p2p case"

This reverts commit 1d56ac3586c98240f940aaa852b7eee8199de07a.

Change-Id: I9911c845968b638079757d28925db50212ea524f
performance: Add Performance class

New Performance class to allow system CPU control

Change-Id: Ie476aefcec7fc20cab8d747ef7c3994b26fcbb62
Add cpuSetOptions API to org.codeaurora.Performance class

Change-Id: I66f7e910f4fee0a9d443356b00b452872628d3f0
Audio: Organize, include only newer ringtones

Change-Id: I8480bab6aee378db137630262015dcd14436aa12
Quick unlock : Fix bug

There is an issue where users whose passwords are greater than 8 chars and
have quick unlock enabled will be unable to unlock their lockscreen.
This is due to the logic evaluating anything beyond 3chars as a password attempt.

This change modifies the quick unlock behavior so that when typing the password,
each character is considered an attempt, however if incorrect, is not reported as a failed attempt.
Only when the user presses enter is it considered an "explicit" attempt and a failed attempt is reported.

Patchset 2 : Rename runnable to better reflect its purpose
Patchset 3 : Switch to new behavior
Patchset 4 : Fix padding

Change-Id: Ida6289c77f6724cb42e8d3b82593f29afe3d6d1b
frameworks/base: bluetooth: AVRCP 1.3 feature changes

Bluetooth module will listen metadata/event change intents
from Music app and post data to Bluez stack.

Modified by Chris Boyle: removed PLAYSTATUS_REQUEST/RESPONSE.
See http://review.cyanogenmod.com/14001

Conflicts:

	core/java/android/server/BluetoothA2dpService.java
	core/jni/android_server_BluetoothEventLoop.cpp

Gingerbread change Icbfb1712dde98c9677f57c869bcfffed2bb42a14

Change-Id: Id8cbec68302b53befbec4273013668a58c755369
Add separate headset and speaker volumes

This is a simple implementation of keeping separate volume
settings for the wired headset and the speaker without
overhauling the audio system.

This allows a person with sensitive headphones to keep music, ringer
and other stream volumes lower than they would usually keep the
speaker volumes.

Change-Id: Ia614c1e3ac548ff4e0104a090cda13b9daef09cb
Fix too long on/off text for setting toggle
SystemUI: Fix data activity overlay not being removed when data is disabled

If mobile data connection is disabled while there is active data
activity, the data activity overlay will not be removed and will
be stuck there. This patch fixes that.

(Previously merged 5c39b1ce3897d166d9c4578106e10a17037b0213 but it was
accidentally removed in 874c5d8cf02054037d137fc38b32b3924e312e8b due to
merge error.)

Change-Id: I0eda652a7533fed8db58d7dca2ba60b0b28a4b81
GCC 4.7 now correctly implements the two-phase name lookup rules

See: http://gcc.gnu.org/gcc-4.7/changes.html

Change-Id: Iaf285e2ebf4456a063817858ffa358e9380e9012
Profiles: add sync and mobile data override (1/2)

Change-Id: I93fe2af38b3fe49c1aa555cf5f27c366fd38ab91
WebSettings: Add ro.cm.version to default user agent.

Change-Id: Ic14a1626ab7bec26297e2041bdcfb26ca7b3a440
Added support for a fourth audio device - dock

Adding persistant setting to choose to use usb audio

Change-Id: I3860c04c8f14e8e98d79d82a354a92b78565c3d1
Make the volume overlay more functional 1/2

This Patch is to add new Volume Overlay Styles

 * Make the Icon on left touchable to go to Sound Menu
 * Always show the Phone Ring volume in expanded (for devices that have phone)
 * Always show the Alarm volume in expanded mode
 * Put an Option in Sound menu to choose a Style (see 2/2 patch)
    - Single : as default
    - Expandable : Enable the more link to expand all choosen volumes
    - Expanded : Show all volumes
    - Off : show no overlay
 * Fix a BUG that when you linked the volumes you got 2 phone icons
 * Fix a BUG when linked all volumes did not move when using hard buttons
 * Fix a BUG when you drag when linked, other expanded did not move
 * Added a default mode so non-telephone devices get Expandable by default

Note : When you are using BT in phone call
or the phone normally there is an extra expanded volume

Change-Id: Ie716e55ba6d4e89a1a67c59b9934d4e088833c5b
Add option for switching between UMS and MTP/PTP mode. (1/2)

This adds support for switching between UMS and MTP/PTP.
Framework part (this part) will only enable UMS if the config setting is set.
Standard is to enable UMS if the primary volume supports UMS.

p2: Fix compile error
p3: Some code styling
p4: Fix mysterious bug where USB notification is not fired when switching from UMS.
p5: Revert last commit.

Change-Id: I753b7dd3823958da1b043ca44b50118d67637cc1