Fix missing merge pieces on vibration service
Fix FindBugs issues

IntProperty: Infinite recursive loop
SQLiteSession: Null pointer dereference
UsbStoreActivity: Null pointer derefence
LocationManagerService: No relationship between generic parameter and method argument
ActivityManagerService: Call to equals() comparing different types
ChooseAccountTypeActivity: Possible null pointer dereference
RuimRecords: Possible null pointer derefence

Change-Id: I9d631c50c30eb98e32cca5a5085513b6904db676
Port "Fix display of mobile status bar icon when using airplane mode"

Change-Id: Icb5b33008f97eaefd67bb4e5acd1e38bcf2dcb70
framework: port "fix notification icons not animating till ticker is updated"

Change-Id: I42d33568fe200089e6dd72c5178d21ad2d76682c
GlowPadView : Re-enable magneticTargets

Re-enable magneticTargets and add logic to make it
compatible with lockscreen shortcuts.

Change-Id: I523141f03566804888fde08a116f73ea62ca523e
Improve tethering notification icons

Replaces the stock icons with the ones I submitted as part of
http://review.cyanogenmod.com/#/c/15930/ in CM9.

Change-Id: Iecfae9ad579c6c9ae06da0a08b61e9359a8a37b0
Framework: Restore Keyguard-obsolete to AOSP state

Some of the CM features code got merged into the obsolete keyguard
code, revert to pure AOSP state.

Change-Id: I6980f9254b49cf1208dd1536f625951d804445ae
Remove duplicate notifications

Acrux=Antares and Bellatrix=Betelgeuse.

I'm guessing these are duplicate due to differing
names. I believe Antares and Betelgeuse are the names
in AOSP, so leaving those two.

Change-Id: Ie58b20039bb4343c9907fc5bc31e099fd942bb87
Remove references to removed notifications.

Remove references to files deleted by patch: http://review.cyanogenmod.com/#/c/16913/

Change-Id: Ic40ad7aa1cd43843effc4456c52b6c3fe52b7165
bootanimation: allow using RGB565 instead of ARGB8888

RGB565 uses considerably less memory, and together with texture
cache, it allows us to offer a really smooth bootanimation on
not so powerful devices.

Change-Id: I9da8fd7e6a587b5895519dd0983ec9b8f676771b

Conflicts:

	cmds/bootanimation/Android.mk