Merge "fix sms receiving for some Samsung CDMA phones" into ics
Merge "Lockscreen : Fix vol wake for lockscreen security type none" into ics
Merge remote branch 'upstream/ics' into ics
framework/base: Change to enable mm-parser.

- mm-parser related enums are added in framework
- adding ExtendedExtractor module to plug-in mm-parser with framework
- adding MIME type that are supported by mm-parser

Patchset 1: Add QCOM_HARDWARE ifdefs.

Change-Id: I06b330275605a84668c6690570805892eb2b17d0
Signed-off-by: Evan McClain <aeroevan@gmail.com>
framework/base: Add customized parameters for camera features.

Patchset 1: Add QCOM_HARDWARE ifdefs.
Patchset 2: Don't need to ifdef snprintf over sprintf.

Change-Id: Id39c71976823ad18627f1e14d1b5e2fd0597c82e
Signed-off-by: Evan McClain <aeroevan@gmail.com>
stagefright: Additional types for Colorconvertor

- Define structure and enums to be used by stagefright
  to interact with mm-color-convertor library

Patchset 1: Add QCOM_HARDWARE ifdefs.

Change-Id: If2a01e3255b8e108f4559e016f31e6195976476a
Signed-off-by: Evan McClain <aeroevan@gmail.com>
Turkish: Fix too long on/off text for setting toggle

Change-Id: I095cabaaeec973cd0e822a0f61bb0dedbaca7b68
Fix status bar brightness control key

renamed everywhere, on request...

require http://review.cyanogenmod.com/13776

Change-Id: I87eff5c453a4150c4f21e1facac2244e68829ce3
Fix 5960562: Show emergency button on PukUnlock screen

This fixes an issue where the device doesn't show the emergency button
on the SIM PUK unlock screen. The problem was introduced in I3127bfd5
where we allowed the button to be conditionally shown.

Change-Id: I3e2aae2bce89399a2564c3f8a726a8db99cdec86
Add support for external dock batterys

-- Allow the external battery status to be read via framework

Change-Id: Icb5fe703474326e416d9bd2dc099a31139835cf4
GraphicBufferManager: getphys: fixed type of paddr

Change-Id: I63f6dd4d36a589f4bb718d71641f23b995ab3903
libbinder: Export older versions of binder symbols

libbinder's enforceInterface function has changed, and even though the API
is backwards-compatible, the ABI isn't. Proprietaries linked with an older
(pre-gb) libbinder.so will fail without this
Additionally, ICS changed the argument types for appendFrom; add a wrapper
for that one.

Change-Id: Ib719f6fba3d8725ad81a2afaa419b7ee52fd3780
Merge "libbinder: Export older versions of binder symbols" into ics
HDMI: Temporary qcom HDMI fixes

Since we still don't have a user-controllable Setting to enable HDMI,
enable it by default.
Also, for devices with trouble matching the HDMI clocks in the receivers,
add the possibility of letting the controller choose the resolution
on its own with the build-time TARGET_QCOM_HDMI_RESOLUTION_AUTO flag

Change-Id: I3ca0639e9f644872a3585f04f2cf8180d8451f2c
telephony: Fix tests

The telephony tests were broken after the addition of needsOldRilFeature()
to the class, so add it to the tests as well

Change-Id: Ic903cda8dfc91d9e617789684843713196f9cde4
Merge "HDMI: Temporary qcom HDMI fixes" into ics
Fix notification led regex typo

Change-Id: I7bfeacf6d51a554063492adee58e9162086f36a1
Merge "Fix notification led regex typo" into ics
Merge "GraphicBufferManager: getphys: fixed type of paddr" into ics
Merge "Restore flashlight." into ics