Remove left behind log/debugging code

Change-Id: I470ad3cfbfdceea317f986c5e856f54ce348e52d
Fix crashes on video playback.

Change I8ee9162536da5711e383dd1d89dca4fa1da107be missed correct variable
initializations at one of two places, which led to a null pointer
dereference. This patch fixes that.
It also updates the variable that stores the original allocated length
to be of the same type as used in the OMX buffer header.

Change-Id: I15b083da8565ec3e8769d18ba1f19d3b12f54cb1
Remove duplicate ringtone

Change-Id: I360601fe861e1a9084081dde66e7466d408435c2
Merge "Remove left behind log/debugging code" into ics
webkit: Reduce processing in WebCore thread while scrolling and zooming

Change-Id: If29ccd0248b02f3dbc02957494d2aa942c7112ac
LGEQualcommUiccRIL: Disable setupDataCall override

This is apparently not necessary anymore

Change-Id: I026b6bf40ff629c8db640520adef2a61b6e14fed
Merge "webkit: Reduce processing in WebCore thread while scrolling and zooming" into ics
Merge "Fix crashes on video playback." into ics
Merge branch 'ics' of git://github.com/AOKP/frameworks_base into ics-aokp

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/DockBatteryController.java
Lockscreen: reworked layout of the Music controls

preview: http://db.tt/Nl05de2p

Change-Id: I74141b54c60cdb72426cbe838c36a8d2ce4b3df7
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
SurfaceFlinger: Let HWC handle an alpha blending
                when either C2D or DYN is set

Before we only use GPU to blend an alpha value.
However C2D can also handle the alpha blending,
when the composition type is set to either C2D or DYN,
use HWC to handle this.
And set the alpha value of C2D to HWC_BLENDING_PREMULT,
so later C2D can set alpha blending parameter.

Change-Id: I53be1d4219fbf2467a6391276d59213858a50058
surfaceflinger: call perform function with custom events to HAL

- SF will call perform with event and value to inform HALS about
  custom events(external display, orientation change etc.,)
- remove actionsafe related functions.

CRs-Fixed: 341947
(cherry picked from commit ca1e7b9ee353bc4d2fdc2234d8860e84bbff74f1)

Change-Id: Icfe5f2f8ce56561c6959e206771b2850a3597e70
Merge branch 'ics' of git://github.com/AOKP/frameworks_base into ics-aokp
drawable: fix ugly gradient on dark holo background

Change-Id: Ie426f1460801b8a029def8a1f97f2b911c7bb9cb
Fix restoring network mode preference on reboot.

When a user sets the option to use only 2G networks (for GSM networks) or its
equivalent for CDMA networks, each reboot erases that setting. That forces
the user to re-select the same option after each boot.
This (very simple) patch fixes it.

Change-Id: Ib9e4bba6da705c127ce1f3aa3c242b9262541cee
Revert "SystemUI: add some padding to tablet nav buttons"

Don't think this looks all that great to be honest

This reverts commit c2e10f3064af745827190b61e3d1c7829d70e705
Merge "Fix restoring network mode preference on reboot." into ics
telephony: SamsungRIL cleanup

== RIL ==
* remove unused "found" boolean in processSolicited
* make requestToString/repsonseToString append the request
  ID on unknown requests.

== Samsung RIL ==
* add CM copyright header to file
* SAMSUNG_UNKNOWN_MAGIC_REQUEST_3 is actually UNSOL_AM
* add DIAL_EMERGENCY to a SamsungRIL::requestToString
* add DIAL_EMERGENCY response to processSolicited
* move emergency dialing into dialEmergencyCall()
* dialEmergencyCall() also ditches UUS info like on stock.
* cleanup and improve readibility of responseCallList()
* move isVideo before isVoicePrivacy, as it is in stock:
    ref "stock" code: http://pastebin.com/WePMyXDi
    ref "stock" order: isMpty then isMT then als then isVoice then isVideo
                       then isVoicePrivacy
    ref cm code: http://pastebin.com/UU105gNr
    ref cm order: isMpty then isMT then als then isVoice then
                  isVoicePrivacy then "videoMagic"
* general cleanup

Change-Id: Ic4ada0a3d6ac1bf580b3930a2599a91e822540ef
telephony: CDMA: fix ERI display when device is in airplane mode

currently when a CDMA device is in airplane mode, the ERI display
shows "Searching for Service"
the radio is OFF, and not searching for anything, so fix it to
actually display the radio status correctly

Change-Id: I3acfb509291867e1a8e35163a89d86719aa40479
smdk4210: fix setPreferedNetworkType when mobile data is connected

Change-Id: I42997c13a8582a401d4d80cfe98227a1ecb446eb