Redid vibrator multipler

Conflicts:

	services/java/com/android/server/VibratorService.java

Cleaned up some coding

Conflicts:

	services/java/com/android/server/VibratorService.java
Swap volume buttons when the screen is rotated by 90 or 180 degrees

  Author:    Laszlo David <laszlo.david@gmail.com>

Conflicts:

	core/java/android/provider/Settings.java
Frameworks: ElectronBeam get some love (1/2)

 Author:    Lars Greiss <kufikugel@googlemail.com>

Conflicts:

	core/java/android/provider/Settings.java
	services/java/com/android/server/power/DisplayPowerController.java
	services/java/com/android/server/power/DisplayPowerRequest.java
	services/java/com/android/server/power/PowerManagerService.java
Profiles: add PROFILES_STATE_CHANGED_ACTION broadcast intent

Added a new broadcast intent to profiles manager (PROFILES_STATE_CHANGED_ACTION), for
notify an event when profiles are enabled or disabled.

Change-Id: If701b3be54157c23acdf74e1da658fbce335437e
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Notification shortcuts spacing and tablet transition fix

Change-Id: Ifcf888673b6ab80b43d427cf2a03b0beb7f56689

Conflicts:

	packages/SystemUI/res/values/dimens.xml
Make Camera shutter follow device sound setting

Change-Id: Ia8eca52f9be94abef6c386545991f9ebe0855bb7
Fix Dotted Circle Battery Style

When dotted circle or dotted circle
with percent option is selected. It
still shows the solid circle style.

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/CircleBattery.java
Remove Kill App Longpress Back/Adjust Timeout

This is replaced by hardware key bindings.
Under interface settings you can bind the
back key to perform the same functionality.
Adjusted back press timeout value to 1000ms

Conflicts:

	core/res/res/values/config.xml
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
Low battery warning policy (1/2) (Credit C3C0)
Option to choose how low battery warning will be indicated
- Popup dialog and sound
- Popup dialog only
- Sound only
- Off
Allows notification behavior selection
Credit: Michele Primavera
fixed inconsistant define values with android_nfc.h

Change-Id: Idccd2de60caf7b72839d158b39d14e2cfcdd5fc7
frameworks/base: vectorize Bitmap operations

Enable gcc vectorizing optimizations for Bitmap operations within
libandroid_runtime.so.  Adds -ftree-vectorize -mvectorize-with-neon-quad
-fprefetch-loop-arrays to functions and compiles Bitmap.cpp in ARM mode
(necessary to enable vectorizing optimizations) for appropriate targets.

Change-Id: I12defef6f47adf41af849df6e750097f5906d92d
Have DashClock hide lockscreen clock

Author   Nathan Grebowiec <njgreb@gmail.com>
Fix for navbar back/menu firing for longpress actions

Change-Id: I9661b8faa001e69b3a44c91d53f0e858031d08dd
Include android.permission.ACCESS_SUPERUSER permission in the base API

Since we don't include this version of the su binary we need to
register this permission other wise if user installs Koush's Superuser
apk later all apps previously installed will not be granted
superuser permission as it, the permission, did not exist when apk
previously asked for permissions

This is a hack to avoid Android Issue 25906
 (https://code.google.com/p/android/issues/detail?id=25906)

Change-Id: I4bc044fa8808d7e11e8cc004f680a99d11d9b66d

Conflicts:

	core/res/AndroidManifest.xml
LockscreenPattern : Toggle dots/error pattern visibility (1/2)

Give user ability to hide error pattern / dots.

Part 2 : http://review.cyanogenmod.org/#/c/33004/

Patchset 2 : Minor formatting
Patchset 3 : Cleanup commit msg

Change-Id: I2af7403b0f72c72e13dd1dec73f8d335ff4029bf
Audio continue to played even if paused manually

Currently, audio will resume playing after a phone call
or notification even if the user had manually paused playback.

This patch addresses that by introducing a new player state
to distinguish the user pausing playback and the browser
losing audio focus for some other reason. Audio will only
 resume if the browser temporarily lost audio focus and
not when the user has manually paused playback.

Change-Id: I9e8beaedb0fcc5afe920068297ed9c387eab2ac8
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
jni: remove obsolete flag from makefile

Change-Id: Ia7e67694a736745333e9d36396b8cb6194fd26ec
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>

Conflicts:

	core/jni/Android.mk
Update Charging Animation
Add Power & Camera to Lockscreen longpress buttons (1/2)

<3 cordell

Change-Id: I9a57487abefe4a1a3a2bcec3f4e9309a6f3af962