domx: define conflict fix
libsensors: fix compile error
overlay: remove broken overlay file
Merge branch 'cm-10.2' into cm-11.0
codec changes for 4.4
overlay: fix for 4.4
Merge branch 'cm-11.0' of https://github.com/KFire-Android/android_device_amazon_otter-common into cm-11.0
turn off TI specific wpa_supplicant for now
bootanim: fix pvr crash by using 480 version

Change-Id: I80df44bcedd6c8155c1128d2f8c0537902803835
pvr-blobs: call 540 specific vendor.mk

Change-Id: Ia2b8b5b0b40a90619a0e5515542856f4f835768b
wifi: change back to TI supplicant

Change-Id: I40cac9e07dcf53d3f0ab6eb790b9922ec4297aa6
otter-common: wl127x: Use firmware in hardware/ti/wlan

no reason for use prebuilt since http://review.cyanogenmod.org/#/c/51224/

Change-Id: I8184f8fb776edb1fd23ece6f80bcb546d6e3e184
otter-common: Remove old Trebuchet overlay

Change-Id: I5a8c58e48e122670e9255a0030dfee55d8ca84b8
Merge "otter-common: Remove old Trebuchet overlay" into cm-11.0
otter-common: Remove redundant packages

Change-Id: Ib5523575062a20e8d3c9b96e628e6aaf6be21bb8
otter-common: Hide reboot to recovery option in Reboot menu until it works

Currently it just reboot to system, hide it for workaround

Change-Id: I22e61c19bd3e9ea2298584db9615d1f2d3255bf2
Revert "overlay: Disable Screen-off animation until it works"

This reverts commit fab6dc1fd497367070e84f72022749cb8e1e768d.

Electron beam animation had never worked since cm10.1 but somehow
now it's working on cm11.0, it's time to revert this.

Change-Id: Idc76818deadc0baedbd90eaa3f7bf310d1b7e75c
Revert "otter-common: Hide reboot to recovery option in Reboot menu until it works"

This reverts commit 992ffa14870d60a2a7253060d538d95fb94f66e8.

depend on:

http://review.cyanogenmod.org/#/c/58641/
http://review.cyanogenmod.org/#/c/58642/

Change-Id: I6ede743e547f8fa250c43d15e7252c947e24db34
Merge "otter-common: Remove redundant packages" into cm-11.0
otter-common: media_codecs: add avc encoding

This add ability to use screenrecord

Change-Id: I5a3d3773000a3c3580860e630a59d09cf5113580