The Android Automerger 
							
						 
					 
					
						
						
							
						
						63d2f6db2e 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to lmp-mr1-dev  
						
						 
						
						
						
						
					 
					
						2015-02-04 06:08:53 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						f0b38a3fc9 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to lmp-mr1-dev  
						
						 
						
						
						
						
					 
					
						2015-01-08 09:31:57 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						ecb7dcc084 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to lmp-mr1-dev  
						
						 
						
						
						
						
					 
					
						2014-12-08 06:09:01 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						f6f04b82e2 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to lmp-mr1-dev  
						
						 
						
						
						
						
					 
					
						2014-12-03 06:08:43 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						25726c8ce4 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to lmp-mr1-dev  
						
						 
						
						
						
						
					 
					
						2014-12-02 06:08:56 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						fffca9eb3d 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to lmp-mr1-dev  
						
						 
						
						
						
						
					 
					
						2014-11-24 06:09:01 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						d602328201 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to lmp-mr1-dev  
						
						 
						
						
						
						
					 
					
						2014-11-18 06:09:23 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						fa06d6dba7 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to lmp-mr1-dev  
						
						 
						
						
						
						
					 
					
						2014-11-17 06:09:15 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						5831077f76 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to lmp-mr1-dev  
						
						 
						
						
						
						
					 
					
						2014-11-13 06:10:24 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						5553ed1e85 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  9d3382d97a 
						
						 
						
						
						
						
					 
					
						2014-11-08 06:09:36 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						4107b7d092 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  9d3382d97a 
						
						 
						
						
						
						
					 
					
						2014-11-06 06:09:56 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						b8e430701e 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  9d3382d97a 
						
						 
						
						
						
						
					 
					
						2014-11-05 06:09:40 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dmitriy Ivanov 
							
						 
					 
					
						
						
							
						
						e4ae96ffd3 
					 
					
						
						
							
							Revert "Fix dlsym() to take into account RTLD_GLOBAL/LOCAL"  
						
						 
						
						... 
						
						
						
						This reverts commit c85e82dde5 .
Bug: 18222321
Bug: 18211780
Change-Id: I32f4048bd5ea85dc8a3dfccce8cf141b241ab692 
						
						
					 
					
						2014-11-04 14:07:46 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dmitriy Ivanov 
							
						 
					 
					
						
						
							
						
						d84897d4a3 
					 
					
						
						
							
							Revert "Add RTLD_NODELETE flag support"  
						
						 
						
						... 
						
						
						
						This reverts commit c87f65d2cd .
Bug: 18222321
Bug: 18211780
Change-Id: I00252e26a28a41ab9f1e2dd3b32f0f80d86297f1 
						
						
					 
					
						2014-11-04 14:07:46 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dmitriy Ivanov 
							
						 
					 
					
						
						
							
						
						189ac9f142 
					 
					
						
						
							
							Revert "Fix relocation to look for symbols in local group"  
						
						 
						
						... 
						
						
						
						This reverts commit fd2747bb58 .
Bug: 18222321
Bug: 18211780
Change-Id: I2d4ebab1e73b7277161af76b99f8249825b22d65 
						
						
					 
					
						2014-11-04 14:07:46 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dmitriy Ivanov 
							
						 
					 
					
						
						
							
						
						8bf7353b79 
					 
					
						
						
							
							Revert "Remove unnecessary lookups during relocations"  
						
						 
						
						... 
						
						
						
						This reverts commit 6442dbd3bc .
Bug: 18222321
Bug: 18211780
Change-Id: I87b18a32238a1f75afe56149221b6691f50d9f56 
						
						
					 
					
						2014-11-04 14:07:46 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dmitriy Ivanov 
							
						 
					 
					
						
						
							
						
						8b952f5552 
					 
					
						
						
							
							Revert "Fix mips build"  
						
						 
						
						... 
						
						
						
						This reverts commit bf3d5ef5fd .
Bug: 18222321
Bug: 18211780
Change-Id: I902ed888197b358c77303f1acb6d5ffd7ae6dcd3 
						
						
					 
					
						2014-11-04 14:07:46 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dmitriy Ivanov 
							
						 
					 
					
						
						
							
						
						86fdf8f09b 
					 
					
						
						
							
							Revert "Fix symbol lookup order during relocation"  
						
						 
						
						... 
						
						
						
						This reverts commit 976402cca1 .
Bug: 18222321
Bug: 18211780
Change-Id: Iafdd3d843db7b1cf288be9a0232022816622c944 
						
						
					 
					
						2014-11-04 14:07:46 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dmitriy Ivanov 
							
						 
					 
					
						
						
							
						
						b9f21a08f3 
					 
					
						
						
							
							Revert "Fix arm64 and arm builds."  
						
						 
						
						... 
						
						
						
						This reverts commit 445111a1c9 .
Bug: 18222321
Bug: 18211780
Change-Id: I4fa9e1b63ec9b528f8bfed73c2ec15046c43a2fe 
						
						
					 
					
						2014-11-04 14:07:46 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						0c7105c69f 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  d18f4b2578 
						
						 
						
						
						
						
					 
					
						2014-11-04 06:09:42 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						99e148e30c 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  445111a1c9 
						
						 
						
						
						
						
					 
					
						2014-11-03 06:09:01 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						b0daba3da1 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  445111a1c9 
						
						 
						
						
						
						
					 
					
						2014-11-02 06:08:55 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						13baf92d93 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  653263a964 
						
						 
						
						
						
						
					 
					
						2014-11-01 06:09:02 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						09fa97fd17 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  b0693ec582 
						
						 
						
						
						
						
					 
					
						2014-10-30 06:08:57 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						609f5cb21d 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  0cc59dd303 
						
						 
						
						
						
						
					 
					
						2014-10-29 06:08:51 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						05c3adbabf 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  aa6cd5819c 
						
						 
						
						
						
						
					 
					
						2014-10-28 06:10:08 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						b50945d935 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  aa6cd5819c 
						
						 
						
						
						
						
					 
					
						2014-10-27 06:08:44 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						fa29966094 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  aa6cd5819c 
						
						 
						
						
						
						
					 
					
						2014-10-26 06:08:41 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						5c9ba49803 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  aa6cd5819c 
						
						 
						
						
						
						
					 
					
						2014-10-25 06:08:59 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						0e5f7b9b3c 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  8fab8119dd 
						
						 
						
						
						
						
					 
					
						2014-10-23 06:09:33 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						ddedd3a38d 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  c712ceeec4 
						
						 
						
						
						
						
					 
					
						2014-10-22 06:08:46 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						75f6f21a75 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  c712ceeec4 
						
						 
						
						
						
						
					 
					
						2014-10-21 06:08:46 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						0f17126b24 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  59a02860a4 
						
						 
						
						
						
						
					 
					
						2014-10-20 06:08:44 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						eca44bc1f3 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  59a02860a4 
						
						 
						
						
						
						
					 
					
						2014-10-19 06:08:38 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						99415296ac 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  59a02860a4 
						
						 
						
						
						
						
					 
					
						2014-10-18 06:09:03 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						f020640c09 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  59a02860a4 
						
						 
						
						
						
						
					 
					
						2014-10-16 06:09:16 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						466c8cbd50 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  59a02860a4 
						
						 
						
						
						
						
					 
					
						2014-10-15 06:09:02 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						c9b1201be1 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  59a02860a4 
						
						 
						
						
						
						
					 
					
						2014-10-14 06:08:58 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						91221be747 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  e0fafb019e 
						
						 
						
						
						
						
					 
					
						2014-10-13 06:09:12 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						d60cda85b9 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  2f25cf373c 
						
						 
						
						
						
						
					 
					
						2014-10-12 06:08:41 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						50d615236d 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  2f25cf373c 
						
						 
						
						
						
						
					 
					
						2014-10-11 06:08:51 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						d67e1d8ae9 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  e5d4fc39e3 
						
						 
						
						
						
						
					 
					
						2014-10-09 06:08:53 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						bc9cee7f58 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  e5d4fc39e3 
						
						 
						
						
						
						
					 
					
						2014-10-08 06:09:28 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						f51bbbe319 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  6c4e16f634 
						
						 
						
						
						
						
					 
					
						2014-10-07 06:08:55 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						26df9bf109 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  02542b3bbd 
						
						 
						
						
						
						
					 
					
						2014-10-06 06:08:57 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						4877fe15c2 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  02542b3bbd 
						
						 
						
						
						
						
					 
					
						2014-10-05 06:08:48 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						975164af3c 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  22f5a61d95 
						
						 
						
						
						
						
					 
					
						2014-10-04 06:09:07 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						1f5a9a4b35 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  e4f8962ab5 
						
						 
						
						
						
						
					 
					
						2014-10-02 06:09:27 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						dd4b377612 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  aaad548535 
						
						 
						
						
						
						
					 
					
						2014-10-01 06:09:15 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						f9c31b1115 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  aaad548535 
						
						 
						
						
						
						
					 
					
						2014-09-30 06:09:53 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						e09a9d77d2 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  aaad548535 
						
						 
						
						
						
						
					 
					
						2014-09-29 06:09:50 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						bc04ede139 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  aaad548535 
						
						 
						
						
						
						
					 
					
						2014-09-28 06:08:54 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						fe054482cc 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  aaad548535 
						
						 
						
						
						
						
					 
					
						2014-09-27 06:09:13 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						a950f53fc3 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  086bb382db 
						
						 
						
						
						
						
					 
					
						2014-09-25 06:09:36 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						e647a62805 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  027d2717d0 
						
						 
						
						
						
						
					 
					
						2014-09-24 06:09:48 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						bc2fb531b7 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  027d2717d0 
						
						 
						
						
						
						
					 
					
						2014-09-23 15:13:51 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						460c53d4d4 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  027d2717d0 
						
						 
						
						
						
						
					 
					
						2014-09-23 04:45:29 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						8f0c298a3d 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  027d2717d0 
						
						 
						
						
						
						
					 
					
						2014-09-22 11:44:31 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						d830465de8 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  027d2717d0 
						
						 
						
						
						
						
					 
					
						2014-09-22 11:13:42 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						306d80e339 
					 
					
						
						
							
							merge in lmp-mr1-release history after reset to  027d2717d0 
						
						 
						
						
						
						
					 
					
						2014-09-22 10:17:00 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						6078d68321 
					 
					
						
						
							
							merge in lmp-release history after reset to  027d2717d0 
						
						 
						
						
						
						
					 
					
						2014-09-15 06:09:45 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						277c1b00f5 
					 
					
						
						
							
							merge in lmp-release history after reset to  7e00b44e80 
						
						 
						
						
						
						
					 
					
						2014-09-14 06:09:35 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						50982fd0c4 
					 
					
						
						
							
							merge in lmp-release history after reset to  1d12f186ed 
						
						 
						
						
						
						
					 
					
						2014-09-13 08:42:01 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						25232c43fc 
					 
					
						
						
							
							merge in lmp-release history after reset to  7e00b44e80 
						
						 
						
						
						
						
					 
					
						2014-09-13 06:09:46 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						1d12f186ed 
					 
					
						
						
							
							merge in lmp-release history after reset to  33a73bfa07 
						
						 
						
						
						
						
					 
					
						2014-09-11 06:09:09 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						fab4d76b46 
					 
					
						
						
							
							merge in lmp-release history after reset to  7efad83d43 
						
						 
						
						
						
						
					 
					
						2014-09-10 06:09:15 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						604b2f5789 
					 
					
						
						
							
							merge in lmp-release history after reset to  7efad83d43 
						
						 
						
						
						
						
					 
					
						2014-09-09 06:09:23 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						ddca20bda4 
					 
					
						
						
							
							merge in lmp-release history after reset to  47ed03f70c 
						
						 
						
						
						
						
					 
					
						2014-09-08 06:09:42 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						d0beefdcd3 
					 
					
						
						
							
							merge in lmp-release history after reset to  47ed03f70c 
						
						 
						
						
						
						
					 
					
						2014-09-07 06:08:57 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						ee809b90e8 
					 
					
						
						
							
							merge in lmp-release history after reset to  dc3814bcf9 
						
						 
						
						
						
						
					 
					
						2014-09-06 08:50:41 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						b2c6088b1e 
					 
					
						
						
							
							merge in lmp-release history after reset to  5beddb7d64 
						
						 
						
						
						
						
					 
					
						2014-09-06 06:08:46 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						dc3814bcf9 
					 
					
						
						
							
							merge in lmp-release history after reset to  1e010d6039 
						
						 
						
						
						
						
					 
					
						2014-09-04 06:09:31 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						d9bead2357 
					 
					
						
						
							
							merge in lmp-release history after reset to  cb093d1f55 
						
						 
						
						
						
						
					 
					
						2014-09-03 06:09:05 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						8c673ec8e9 
					 
					
						
						
							
							merge in lmp-release history after reset to  c191a8adee 
						
						 
						
						
						
						
					 
					
						2014-09-02 06:09:09 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						daebe2764b 
					 
					
						
						
							
							merge in lmp-release history after reset to  b2eb09a9ed 
						
						 
						
						
						
						
					 
					
						2014-09-01 07:54:46 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						2fcb94d52c 
					 
					
						
						
							
							merge in lmp-release history after reset to  b2eb09a9ed 
						
						 
						
						
						
						
					 
					
						2014-08-31 09:30:23 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christopher Ferris 
							
						 
					 
					
						
						
							
						
						20dc3f8fa4 
					 
					
						
						
							
							Replace snprintf calls in linker.  
						
						 
						
						... 
						
						
						
						When enabling debug malloc, the snprintf calls in the linker fails to
update the buffer.
The problem is that snprintf makes a call to pthread_getspecific that
returns a valid pointer, but the data it points to is zero. This should
never happen and causes the snprintf to stop and do nothing.
Temporarily replace snprintf with a different implementation to work
around this issue.
Bug: 16874447
Bug: 17302493
Change-Id: I7a500f28adf153150cf2812fae745ff41f1c48d3 
						
						
					 
					
						2014-08-27 16:12:09 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						54a6221cc2 
					 
					
						
						
							
							merge in lmp-release history after reset to  3f7635f490 
						
						 
						
						
						
						
					 
					
						2014-08-27 06:09:31 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						489b5d23fd 
					 
					
						
						
							
							merge in lmp-release history after reset to  84d0683a82 
						
						 
						
						
						
						
					 
					
						2014-08-26 06:09:09 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						5f17e16e92 
					 
					
						
						
							
							merge in lmp-release history after reset to  84d0683a82 
						
						 
						
						
						
						
					 
					
						2014-08-25 06:08:46 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						3bd669c605 
					 
					
						
						
							
							merge in lmp-release history after reset to  84d0683a82 
						
						 
						
						
						
						
					 
					
						2014-08-24 06:08:24 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						cb278332cb 
					 
					
						
						
							
							merge in lmp-release history after reset to  84d0683a82 
						
						 
						
						
						
						
					 
					
						2014-08-23 06:09:07 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						fe9787ece9 
					 
					
						
						
							
							merge in lmp-release history after reset to  1506fc178e 
						
						 
						
						
						
						
					 
					
						2014-08-21 06:09:26 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						bae5898f3d 
					 
					
						
						
							
							merge in lmp-release history after reset to  1506fc178e 
						
						 
						
						
						
						
					 
					
						2014-08-20 06:08:54 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						08f6f664ed 
					 
					
						
						
							
							merge in lmp-release history after reset to  6df7b60998 
						
						 
						
						
						
						
					 
					
						2014-08-19 06:08:52 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christopher Ferris 
							
						 
					 
					
						
						
							
						
						a0108accb2 
					 
					
						
						
							
							Fix leak_realloc, copy entire allocation.  
						
						 
						
						... 
						
						
						
						Bug: 16874447
Change-Id: Ie54a73fd75529961195fa5173d9116d0ae897b03 
						
						
					 
					
						2014-08-18 14:10:28 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						58df7d814e 
					 
					
						
						
							
							merge in lmp-release history after reset to  d8e007695c 
						
						 
						
						
						
						
					 
					
						2014-08-18 06:08:40 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						147ce71ddc 
					 
					
						
						
							
							merge in lmp-release history after reset to  d8e007695c 
						
						 
						
						
						
						
					 
					
						2014-08-17 07:14:34 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						2e7c8634b7 
					 
					
						
						
							
							merge in lmp-release history after reset to  8a84d383fb 
						
						 
						
						
						
						
					 
					
						2014-08-14 06:09:40 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						25ffdd7b9f 
					 
					
						
						
							
							merge in lmp-release history after reset to  72d7e667c7 
						
						 
						
						
						
						
					 
					
						2014-08-13 06:10:07 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						e9f34a3ee7 
					 
					
						
						
							
							merge in lmp-release history after reset to  72d7e667c7 
						
						 
						
						
						
						
					 
					
						2014-08-12 06:08:45 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						c323d5efb8 
					 
					
						
						
							
							merge in lmp-release history after reset to  72d7e667c7 
						
						 
						
						
						
						
					 
					
						2014-08-11 06:08:39 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						6cde02273f 
					 
					
						
						
							
							merge in lmp-release history after reset to  72d7e667c7 
						
						 
						
						
						
						
					 
					
						2014-08-10 06:08:22 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						e3ff5fca61 
					 
					
						
						
							
							merge in lmp-release history after reset to  f4d21fba06 
						
						 
						
						
						
						
					 
					
						2014-08-09 06:08:34 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christopher Ferris 
							
						 
					 
					
						
						
							
						
						b5e0854284 
					 
					
						
						
							
							Add a way to disable backtracing in malloc debug.  
						
						 
						
						... 
						
						
						
						The property libc.debug.malloc.nobacktrace set to non-zero disables
getting backtracing when using mode 1 or mode 10.
Bug: 16874447
Change-Id: I7650ba9f4385b5110b743cab01e877fc69545b3c 
						
						
					 
					
						2014-08-08 12:49:19 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						6b9b454d55 
					 
					
						
						
							
							merge in lmp-release history after reset to  3e7b8e2a8b 
						
						 
						
						
						
						
					 
					
						2014-08-07 06:08:25 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						5984773a8d 
					 
					
						
						
							
							merge in lmp-release history after reset to  db7a17d4ff 
						
						 
						
						
						
						
					 
					
						2014-08-06 06:08:43 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						b4725def2e 
					 
					
						
						
							
							merge in lmp-release history after reset to  1b1966d944 
						
						 
						
						
						
						
					 
					
						2014-08-05 06:08:26 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						b8d00ef3ba 
					 
					
						
						
							
							merge in lmp-release history after reset to  61833de613 
						
						 
						
						
						
						
					 
					
						2014-08-04 06:08:13 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						39978ccb7f 
					 
					
						
						
							
							merge in lmp-release history after reset to  61833de613 
						
						 
						
						
						
						
					 
					
						2014-08-03 06:08:23 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						6447d2f4de 
					 
					
						
						
							
							merge in lmp-release history after reset to  61833de613 
						
						 
						
						
						
						
					 
					
						2014-08-02 06:08:40 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christopher Ferris 
							
						 
					 
					
						
						
							
						
						1183762969 
					 
					
						
						
							
							Use libunwindbacktrace for debug malloc code.  
						
						 
						
						... 
						
						
						
						Create a method of disabling the debug allocation code paths so that
it's possible to use the libunwindbacktrace library without any
modifications.
Use this path to create and destroy the maps for the process. It's not
stricly necessary in the init code since the symbols are not modified
until after the initialize calls.
Also, remove the debug_XXX source files that doesn't need to be in libc.so.
Fix the maps reading code since it was completely broken for 64 bit.
Bug: 16408686
(cherry picked from commit 861c0ef37b )
Change-Id: I04445f0cf9a1e85172b64d57df92eb7939ce2332 
						
						
					 
					
						2014-07-30 15:58:42 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						bdf601894f 
					 
					
						
						
							
							merge in lmp-release history after reset to  1a5db57d5a 
						
						 
						
						
						
						
					 
					
						2014-07-29 06:08:34 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						6a20f051a2 
					 
					
						
						
							
							merge in lmp-release history after reset to  c1a6a72560 
						
						 
						
						
						
						
					 
					
						2014-07-28 09:19:57 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						8bc74887c1 
					 
					
						
						
							
							merge in lmp-release history after reset to  c1a6a72560 
						
						 
						
						
						
						
					 
					
						2014-07-27 06:08:13 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						1b710ff000 
					 
					
						
						
							
							merge in lmp-release history after reset to  c1a6a72560 
						
						 
						
						
						
						
					 
					
						2014-07-26 06:08:31 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						13fb0584e1 
					 
					
						
						
							
							merge in lmp-release history after reset to  c86950cb3f 
						
						 
						
						
						
						
					 
					
						2014-07-24 06:08:27 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Colin Cross 
							
						 
					 
					
						
						
							
						
						4514aa630c 
					 
					
						
						
							
							HACK: remove %m support from printf.  
						
						 
						
						... 
						
						
						
						The change that added this support causes a cpu hard lock on one
device.  This code clearly isn't at fault, but disabling it to
unblock until we can find a real fix.
Bug: 16484311
Change-Id: I33834dc49d959ae403b10d2c7cad12ae2950f772 
						
						
					 
					
						2014-07-23 15:49:17 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elliott Hughes 
							
						 
					 
					
						
						
							
						
						0caf70e98e 
					 
					
						
						
							
							Fix belated review comments on syslog change.  
						
						 
						
						... 
						
						
						
						Bug: 14292866
(cherry picked from commit afe6360627 )
Change-Id: I8e3cc6b37b2539e51a27261ffb5d6e58266ce11d 
						
						
					 
					
						2014-07-23 15:49:09 -07:00