da846fcf1b6a7bbd2f9f30c965b25f084568ef75
				
			
			
		
	4c382b13: reconcile main tree with open-source eclair
		
			
			Merge commit '4c382b13657be5d949e7dfc9ef46a66f2eb496e0' into eclair-plus-aosp * commit '4c382b13657be5d949e7dfc9ef46a66f2eb496e0': android-2.1_r1 snapshot
Description
				No description provided
						
						
						
					Languages
				
				
								
								
									C
								
								87.8%
							
						
							
								
								
									Shell
								
								6.6%
							
						
							
								
								
									Makefile
								
								3.1%
							
						
							
								
								
									C++
								
								1%
							
						
							
								
								
									Python
								
								0.7%
							
						
							
								
								
									Other
								
								0.8%