Update MountService to work properly with the Galaxy S line of phones, and allow both internal and external SD to be mountable via PC.

Change-Id: Ie397f4ce4772714deb2990d60e011ab0cee21891
Merge commit 'themes-4.0' into 'ics'

Change-Id: I11e340ce7d56c8e18ed3c4d2ae0040c29aee0b45
stagefright: add msm8960 target support - Credit to intervigilium

Change-Id: Ic2b2bd677652f8296900ec23888ef9efac718031
telephony: HTCQualcommRIL: add QualcommNoSimReadyRIL based HTC RIL

HTC Ville (One S) requires a no sim ready ril, with some HTC specific
changes, such as custom radio power on and iccIO.

Change-Id: I58150e8046da95ebb11a4c78a8441b814ce4fb5d
Recent apps: add Sense4 style task switcher (2/2)

This is based on the code provided by evilisto

http://forum.xda-developers.com/showthread.php?t=1589963

Change-Id: Ie54081a4c7d0090e201661db4c130ce120721854
Add "Pulse low battery light" switch.

Cleaned up gerrit commit
Synced with new frameworks.

This accompanies I5946578d4ab2c7e4affbbd834ccdfbb8beca0a25
Change-Id: Ie7a12e2aa1acc8176d79e8e9cbfe7a17ee16526a
Merge "Update MountService to work properly with the Galaxy S line of phones, and allow both internal and external SD to be mountable via PC." into ics
further theme engine integration

1) reset clock color to theme default when switching themes

2) handle alternate toggle notification in the code to dynamically
  change the color of the "on" background image. cleaned up some
  toggle code in the process.

3) use holo_light color for weather text to match theme

patch set 2
- update signal/wifi text to reset to proper color
- reset colors with tablet statusbar too

patch set 3
- use a common method to reset colors on theme change

patch set 4
- reset nav bar colors and re-make the nav bar to
   reflect the changes

Change-Id: I2fd3adb88771b2dc65664187ead1bbda403ae876
fix reboot/recovery options on powermenu for p99x devices

(Credits to doniqcc)

Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>
Change-Id: I4e2c85f8632b4cffc5d26ed5d6a04cd88ea51da5
increase defualt nav bar glow speeds for better UX

By default, I think it would be better to have them a little faster
  (if not even turn them off by default), as it does cause a little
  lag when they're animating.

Change-Id: Ia2fb7ccf30caca208cf39f89fcf2edd0d4ac8b48
Revert "Fix Decrease lights in custom backligh settings."

Partial revert. Left dock stuff alone.

This reverts commit 7a59b7fd7fbe5cd6be84cc983d92cd51b54a2abb.

The following commit is causing issues with auto-brightness not adjusting
properly. It also reverted a portion of the following commit
https://github.com/AOKP/frameworks_base/commit/7b6795a477d575f9c94e2f9525e95ddb173beb91#diff-2
regarding auto-brightness while docked.

Change-Id: I8490f1933e8747f3625836c75f6509468de72fa4
Merge "stagefright: add msm8960 target support - Credit to intervigilium" into ics
Merge "telephony: HTCQualcommRIL: add QualcommNoSimReadyRIL based HTC RIL" into ics
SystemUI: tablet statusbar improvments

1) move clock to the right and adjust padding
2) use a config value for default boolean of whether
   to hide signal bars (to avoid WiFi icon cut off).
   Requires overriding of config_hideSignalBars
   from false to true

Change-Id: Id63e7b33ccda5f7cd069b59e0eef4fda58026a17
DevicePolicy: Fix lockNow() failing to turn off screen

A fix introduced in 93c518e4f8abd98f87cda1712b30a5a86cfa60dd
causes lockNow() to sometimes (most of the time) fail to turn
off the screen. The screen will turn off, but then immediately turn
on showing the lock screen.

This is caused by getWindowManager().lockNow() call which calls the
method to lock the screen, which the PowerManager service also
call in parallel, leading to a race condition.

The fix is to only call getWindowManager().lockNow() if the screen
is not on.

Change-Id: I235c0f34d5cc15268d569e18e025a87330deced7
Revert "Allow mounting of multiple volumes via mass storage (framework part)"

This reverts commit 0e88fce86e624fa24f328106cc3cd58cf2a1ddc4.
Merge remote branch 'aokp/ics' into ics