merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ibadcd642e060d8b828b13f7c748f0dfddf751906
Fix HWC documentation.

Specify more clearly the behavior of compositionType
and hints.

Change-Id: I9abdccedd904b2fba783381bf9e2f8975ede8d67
audio: add support for VOIP

Change-Id: I5dbddd245c0b20b15505dabd65c5f6d3084115cd
Revert "Change-Id: Ie2dcf87494c71d6da9493eddad8fe0a59ac5f0f9"

This reverts commit 1966e40a05a795cdfdfa6160468cdcb8e46dd619.
FM Radio: Add support for FM Radio in Android

Creating interface and framework for using FM Radio
RX and TX from different vendors.

Change-Id: I1a71aed01bfffdddfabf1cdfbfa3707cb1ed016b
Signed-off-by: Benn Porscke <benn.porscke@stericsson.com>
Add gralloc_perform enums definitions

Define enums for gralloc_perform function use cases.

Change-Id: I127ee7486b74d68b2f97e1670d9550144d6b7a3a
hwcomposer: Add HWC_BLIT compositiontype value

- HWC_BLIT this layer will be handled in the HWC, using a blit engine
- setting this will inform Surfaceflinger to flip FB_TARGET

Change-Id: I25d19ec41b57863d451c3e390109c912faf1381c
Merge "FM Radio: Add support for FM Radio in Android" into cm-10.1
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/hardware/libhardware into 1.1

Android 4.2.2 release 1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_hardware_libhardware into jb-mv