Ricardo Cerqueira c76fa3504d Merge remote-tracking branch 'caf/LA.BF.2.1_rb1.6' into cm-12.0
Conflicts:
	Android.mk
	common/file_contexts
	common/ims.te
	common/mm-pp-daemon.te
	common/netmgrd.te
	common/radio.te
	common/service.te
	common/service_contexts
	common/system_app.te
	common/system_server.te
	common/thermal-engine.te
	common/untrusted_app.te
	common/wpa.te
	msm8960/Android.mk
	msm8960/file.te
	msm8960/file_contexts

Change-Id: I8308142c06d36380d422fd2256cceae2227fd04f
2014-12-29 16:25:58 +00:00
2014-11-28 16:02:40 +00:00
Description
No description provided
9.7 MiB
Languages
Shell 68.6%
Makefile 31.4%