c76fa3504d2596a9a8f82a8145b7e0e521cc927f
				
			
			
		
	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
Description
				No description provided
						
						
						
					Languages
				
				
								
								
									Shell
								
								68.6%
							
						
							
								
								
									Makefile
								
								31.4%