Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
core: use Long.parseLong to parse Fat Volume UUID

Integer.parseInt will fail on UUID such as "FEDC-9876"

Change-Id: I06cb340de6b89b3d7afe30327fd21fd3b46da5cf
QuietHours: disable volume change tone during quiet hours

* Its quiet time, you're trying to be quiet, why would the volume
  change make noise when you're being quiet?
* Turn this off when system sounds are disabled during quiet hours

Change-Id: I6c7eb9d52f5dab9349bf2b8f72ddcb0ab45834fa
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Port: Don't show phone unlock targets for devices without voice (1/2)

Add a separate list of default lockscreen unlock targets for devices
without voice capability.

http://review.cyanogenmod.org/#/c/52965/1

Change-Id: I2e9aa953bf9aeee4c492ae7514bedd9db408863b
Revert "core: use Long.parseLong to parse Fat Volume UUID"

This reverts commit ca372be0f41741c86eb388690a9584dab3a8fb4f.
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Revert "Telephony: Add data rat constant"

See http://review.cyanogenmod.org/#/c/55832/ for reasons.

This reverts commit 60f79613897f74cacceafad7bcd7260fe25bb1e5.

Change-Id: I7eea322dec1cbb3df33e4ee10d4e73fde0c6e934
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Revert "Telephony: Add data rat constant"

See http://review.cyanogenmod.org/#/c/55832/ for reasons.

This reverts commit 60f79613897f74cacceafad7bcd7260fe25bb1e5.

Change-Id: I7eea322dec1cbb3df33e4ee10d4e73fde0c6e934