5.0.1_r1 -> 5.0.2_r1

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

Conflicts:
	default.xml

Change-Id: I0ca41786cb1512596497e4bd7aec4f0df4f5f618