am 6e5be9b2: merge from open-source master
				
					
				
			Merge commit '6e5be9b24c232be4cfc22b7cbabb0fdf6d869f7c' * commit '6e5be9b24c232be4cfc22b7cbabb0fdf6d869f7c': eclair snapshot
This commit is contained in:
		
				
					committed by
					
						
						Android Git Automerger
					
				
			
			
				
	
			
			
			
					commit
					b8f506fb37