The Android Automerger 
							
						 
					 
					
						
						
							
						
						944e192df6 
					 
					
						
						
							
							merge in lmp-release history after reset to  c891e24073 
						
						 
						
						
						
						
					 
					
						2014-10-21 17:42:56 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						2155882080 
					 
					
						
						
							
							merge in lmp-release history after reset to  c891e24073 
						
						 
						
						
						
						
					 
					
						2014-10-21 06:09:30 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						c32cd431fa 
					 
					
						
						
							
							merge in lmp-release history after reset to  c891e24073 
						
						 
						
						
						
						
					 
					
						2014-10-19 17:07:47 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						1840121a6a 
					 
					
						
						
							
							merge in lmp-release history after reset to  c891e24073 
						
						 
						
						
						
						
					 
					
						2014-10-16 06:09:40 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						90a1ed4f45 
					 
					
						
						
							
							merge in lmp-release history after reset to  c891e24073 
						
						 
						
						
						
						
					 
					
						2014-10-15 06:09:27 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						48116b3024 
					 
					
						
						
							
							merge in lmp-release history after reset to  c891e24073 
						
						 
						
						
						
						
					 
					
						2014-10-14 06:09:28 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						614ff987ce 
					 
					
						
						
							
							merge in lmp-release history after reset to  c891e24073 
						
						 
						
						
						
						
					 
					
						2014-10-13 06:09:26 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						8e06009fcd 
					 
					
						
						
							
							merge in lmp-release history after reset to  c891e24073 
						
						 
						
						
						
						
					 
					
						2014-10-12 06:09:31 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						8a2d72d586 
					 
					
						
						
							
							merge in lmp-release history after reset to  1543fdf616 
						
						 
						
						
						
						
					 
					
						2014-10-09 06:09:26 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						d690d19dd0 
					 
					
						
						
							
							merge in lmp-release history after reset to  1543fdf616 
						
						 
						
						
						
						
					 
					
						2014-10-08 06:10:36 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						b7672222a9 
					 
					
						
						
							
							merge in lmp-release history after reset to  d11eac3455 
						
						 
						
						
						
						
					 
					
						2014-10-07 06:09:29 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christopher Ferris 
							
						 
					 
					
						
						
							
						
						24a365fbe4 
					 
					
						
						
							
							Force export symbols on all x86 variants in libc.  
						
						 
						
						... 
						
						
						
						For silvermont, the __popcountsi2 symbol does not get exported by libc.
But for atom, this symbol is exported. Since we already exported this symbol
for previous releases, it's better to just follow through and force
the export, but only for 32 bit. x86 64 bit will not export this symbol.
Bug: 17681440
Change-Id: I6c62245f0960910f64baaaf6d9d090bf3ea5f435 
						
						
					 
					
						2014-10-06 17:50:08 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						6c1389bf5f 
					 
					
						
						
							
							merge in lmp-release history after reset to  a508714800 
						
						 
						
						
						
						
					 
					
						2014-10-06 06:10:13 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						397c90bf3e 
					 
					
						
						
							
							merge in lmp-release history after reset to  a508714800 
						
						 
						
						
						
						
					 
					
						2014-10-05 06:10:03 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						5579bf649f 
					 
					
						
						
							
							merge in lmp-release history after reset to  aaad548535 
						
						 
						
						
						
						
					 
					
						2014-10-01 06:10:44 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						ce77e55ce5 
					 
					
						
						
							
							merge in lmp-release history after reset to  aaad548535 
						
						 
						
						
						
						
					 
					
						2014-09-30 06:11:44 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						8eac9d69d8 
					 
					
						
						
							
							merge in lmp-release history after reset to  aaad548535 
						
						 
						
						
						
						
					 
					
						2014-09-29 06:11:30 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						28a7ed042f 
					 
					
						
						
							
							merge in lmp-release history after reset to  aaad548535 
						
						 
						
						
						
						
					 
					
						2014-09-28 06:10:03 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						7ac9e617b8 
					 
					
						
						
							
							merge in lmp-release history after reset to  aaad548535 
						
						 
						
						
						
						
					 
					
						2014-09-25 06:11:51 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						9416df8139 
					 
					
						
						
							
							merge in lmp-release history after reset to  027d2717d0 
						
						 
						
						
						
						
					 
					
						2014-09-24 06:10:50 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						3ae2ad2aea 
					 
					
						
						
							
							merge in lmp-release history after reset to  027d2717d0 
						
						 
						
						
						
						
					 
					
						2014-09-23 06:10:52 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						ad4be8f64f 
					 
					
						
						
							
							merge in lmp-release history after reset to  027d2717d0 
						
						 
						
						
						
						
					 
					
						2014-09-22 06:10:05 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						7ed41f97bb 
					 
					
						
						
							
							merge in lmp-release history after reset to  027d2717d0 
						
						 
						
						
						
						
					 
					
						2014-09-21 06:09:23 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						59551b8144 
					 
					
						
						
							
							merge in lmp-release history after reset to  44da474bb8 
						
						 
						
						
						
						
					 
					
						2014-09-20 21:00:37 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						194ca8df2d 
					 
					
						
						
							
							merge in lmp-release history after reset to  027d2717d0 
						
						 
						
						
						
						
					 
					
						2014-09-20 06:09:46 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						44da474bb8 
					 
					
						
						
							
							merge in lmp-release history after reset to  027d2717d0 
						
						 
						
						
						
						
					 
					
						2014-09-18 06:09:12 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						dc922ade9f 
					 
					
						
						
							
							merge in lmp-release history after reset to  027d2717d0 
						
						 
						
						
						
						
					 
					
						2014-09-17 06:09:56 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						b3613b4efd 
					 
					
						
						
							
							merge in lmp-release history after reset to  027d2717d0 
						
						 
						
						
						
						
					 
					
						2014-09-16 06:09:53 -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