4.4_r1 -> 4.4_r1.2

Change-Id: Ide5eb79266c984cea0feeee5ddd46161c56624b9
Switch to our fork of chromium_org

Change-Id: I80e11eba8482bee1c24d013c546d9b3ef2e90bc1
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android into CyanogenMod-cm-11.0

Conflicts:
	default.xml