g2:add Japanese Docomo L-01F support

Change-Id: If32a1a76c7f948390afdc9686abc211abef3c5f8
Merge "g2:add Japanese Docomo L-01F support" into cm-11.0
Don't go into full suspension when proximity is triggered

Change-Id: I2a91722b61050698b6684da0a06d959c046416da
camera: Restart preview after ZSL changes only if the preview is running

Don't touch the preview state if it was stopped to begin with

Change-Id: Ie81c01165778f98f92f11badc17c2023ea4610b7
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_device_lge_g2-common into cm-11.0

Conflicts:
	Android.mk
	overlay/frameworks/base/core/res/res/values/config.xml
	releasetools/loki_patch.c

Change-Id: I7bf3d082a2720b3893e7f96deec659a09cb201ea