Merge "Change PT-BR profile title in global action menu" into ics
Merge "Add missing includes for threads.h" into ics
Merge "Update korean translation" into ics
Merge "Support for Virgin Mobile MMS." into ics
Merge "elGR - Added missing strings" into ics
Merge "Update Turkish translations" into ics
Merge "fix sms receiving for some Samsung CDMA phones" into ics
Merge "Lockscreen : Fix vol wake for lockscreen security type none" 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>
libstagefright: Initial commit for video

Patchset 1: Add QCOM_HARDWARE ifdefs.
Patchset 2: Rebase and move omx include to vendor.
Patchset 3: Fix whitespace and missed xFramerate ifdef.

Conflicts:

	include/media/stagefright/OMXCodec.h
	media/libstagefright/OMXCodec.cpp

Change-Id: I6586f3d29524ba031d8c814abdfbb47bb7e5bfda
Signed-off-by: Evan McClain <aeroevan@gmail.com>
frameworks/base: Enabling mmparser for AVI, ASF, QCP, AAC formats

- Add support in MediaScanner for AVI, DIVX
- Add new mime definitions for AVI, DIVX, WMA, WMV, AAC, QCP, AC3, DIVX311
- Add Extended Extractor, register new sniffers
- Enable DIVX, VC1, WMA, QCELP components in OMXCodec

Patchset 1: Add QCOM_HARDWARE ifdefs.
Patchset 2: Fix AVIExtractor include
Patchset 3: Whitespace.

Conflicts:

	include/media/stagefright/OMXCodec.h
	media/libstagefright/DataSource.cpp
	media/libstagefright/Android.mk
	media/libstagefright/OMXCodec.cpp
	media/libstagefright/StagefrightMediaScanner.cpp

Change-Id: Ie92c8a95f513bc9b915a46144adb603d03d1fa18
Signed-off-by: Evan McClain <aeroevan@gmail.com>
libstagefright: Framework changes for video bringup

 -Modified the makefile to define the correct macros depending on the target.
 -Added changes to select the proper video output color format for each target using
the macros defined in the makefile.
 -Modified the thumbnail generation logic to select HW decoders for supported targets.

Patchset 1: Add QCOM_HARDWARE ifdefs and rename TARGET_BOARD stuff.
Patchset 2: Fix ifdef for 8x60 for non-qcom hardware.

Conflicts:

	media/libstagefright/Android.mk

Change-Id: Ia034fb025c116a79937e70101e93fcc478898e8a
Signed-off-by: Evan McClain <aeroevan@gmail.com>
Camera: Add mode in Framework Structure

Patchset 1: Add QCOM_HARDWARE ifdefs.

Change-Id: Ia6f983a998b6ab543d335f2e4e2ab18af97f53fe
Signed-off-by: Evan McClain <aeroevan@gmail.com>
frameworks/base - suspend implementation for video playback

- suspend( ) API is not supported in MediaPlayer.
- On suspend, save current position and seek to the saved
  position when playback is resumed.

Change-Id: I62f79a2984d57841bdbdbe918a38d01d623c0a2b
CRs-Fixed: 281944
libstagefright: Initial commit for Camcorder bringup

- Memcpy mode for camcorder bringup

Patchset 1: Add QCOM_HARDWARE ifdefs.

Change-Id: I2d63c8c643bc2d7a278f4dff7e58d768b9ad4171
Signed-off-by: Evan McClain <aeroevan@gmail.com>
camcorder: disable audio temporarily.

- set property camcorder.debug.disableaudio 1 to disable audio encode

Patchset 1: Add QCOM_HARDWARE ifdefs.

Change-Id: I33b6ba1cfc45c83f7779ae1abe3fddb4631a309e
Signed-off-by: Evan McClain <aeroevan@gmail.com>
libmedia: Update media profile cap for video codecs

- Update H.263, MPEG4 and H.264 profile caps
- Changes made to max width, height, bitrate and fps

Patchset 1: Add QCOM_HARDWARE ifdefs.
Patchset 2: Fix non-qcom createDefaults.

Change-Id: I0d50221a9e38a45fcccb70b7455412abe9a7a48b
Signed-off-by: Evan McClain <aeroevan@gmail.com>
frameworks/base: Add support for QCELP/EVRC non-tunnel encoding in SF

Add support for QCELP and EVRC formats non-tunnel mode encoding
in StageFright using hardware accelerated encoders.

Patchset 1: Add QCOM_HARDWARE ifdefs.
Patchset 2: Fix ifdef derp.
Patchset 3: Fix endif derp, change omx-core include to vendor/qcom.

Conflicts:

	media/libstagefright/Android.mk
	media/libstagefright/OMXCodec.cpp

Change-Id: I179030d71a9598ddddcf754e963fbed1e1357024
Signed-off-by: Evan McClain <aeroevan@gmail.com>