The Android Automerger 
							
						 
					 
					
						
						
							
						
						e13338429f 
					 
					
						
						
							
							merge in jb-mr0-release history after reset to jb-dev  
						
						 
						
						
						
						
					 
					
						2012-07-11 23:11:59 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						77093f2a8b 
					 
					
						
						
							
							merge in jb-release history after reset to jb-dev  
						
						 
						
						
						
						
					 
					
						2012-06-20 06:59:21 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						ff7eae7b08 
					 
					
						
						
							
							merge in jb-release history after reset to jb-dev  
						
						 
						
						
						
						
					 
					
						2012-06-11 06:59:25 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						db2e7a4cb6 
					 
					
						
						
							
							merge in jb-release history after reset to jb-dev  
						
						 
						
						
						
						
					 
					
						2012-06-03 05:59:30 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						e1d591540e 
					 
					
						
						
							
							merge in jb-release history after reset to jb-dev  
						
						 
						
						
						
						
					 
					
						2012-05-31 06:59:25 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ben Cheng 
							
						 
					 
					
						
						
							
						
						2481468f22 
					 
					
						
						
							
							Print the corrupted address passed to free().  
						
						 
						
						... 
						
						
						
						For example:
@@@ ABORTING: INVALID HEAP ADDRESS IN dlfree addr=0x5c3bfbd0
Fatal signal 11 (SIGSEGV) at 0xdeadbaad (code=1), thread 2942
The addr=0x5c3bfbd0 part is new.
Change-Id: I8670144b2b0a3a6182384150d762c97dfee5452f 
						
						
					 
					
						2012-05-25 11:14:20 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						4dc3a7e1ed 
					 
					
						
						
							
							merge in jb-release history after reset to jb-dev  
						
						 
						
						
						
						
					 
					
						2012-05-10 06:59:27 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						e2390bff2e 
					 
					
						
						
							
							merge in jb-release history after reset to jb-dev  
						
						 
						
						
						
						
					 
					
						2012-05-09 07:46:07 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						e0f1fca46c 
					 
					
						
						
							
							merge in jb-release history after reset to jb-dev  
						
						 
						
						
						
						
					 
					
						2012-04-30 06:59:25 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						22d80c0b35 
					 
					
						
						
							
							merge in jb-release history after reset to jb-dev  
						
						 
						
						
						
						
					 
					
						2012-04-25 07:47:06 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						5fb8130be9 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-04-19 06:59:25 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						91b76aa298 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-04-18 06:59:34 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						bfb300152c 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-04-17 06:59:17 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						b5e8d57664 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-04-16 06:59:27 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						f0a9d98a39 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-04-12 06:59:24 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						85611165ab 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-04-11 06:59:29 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Kralevich 
							
						 
					 
					
						
						
							
						
						ad7ff82771 
					 
					
						
						
							
							Revert "linker: remove STB_LOCAL hack"  
						
						 
						
						... 
						
						
						
						This reverts commit 61ff83475c .
This code is harmless, and only applies to the linker, so
there's no harm in keeping it in the tree a little bit longer.
Let's roll this back while we try to figure out the root cause
of bug 6314858.
Bug: 6314858
Change-Id: I9f5ed81d23a7abe273baf792aa8a0a2839ef094c 
						
						
					 
					
						2012-04-10 16:08:31 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						92cf47c006 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-04-10 06:59:26 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						66929e845d 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-04-09 06:59:24 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						199213bba9 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-04-05 06:59:23 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						485fc9f4ef 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-04-03 03:27:58 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						b955ffa5b3 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-04-02 06:59:31 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						30c8b110f3 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-03-28 06:59:31 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						8149d73652 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-03-27 06:59:30 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						665a2207af 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-03-26 06:59:35 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						9f7df549a2 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-03-21 06:59:50 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						6e9e53d15f 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-03-19 06:59:35 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						9bcaf0ea6d 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-03-14 06:59:45 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						26b666b35e 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-03-12 06:59:42 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						56ae6bdaa1 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-03-08 06:59:22 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						151fac68c3 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-03-07 06:59:17 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kenny Root 
							
						 
					 
					
						
						
							
						
						fa3f72ee53 
					 
					
						
						
							
							Revert "Reference __dso_handle in PIC way"  
						
						 
						
						... 
						
						
						
						This reverts commit 93cb308137 
						
						
					 
					
						2012-03-05 11:55:23 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						fa944c190c 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-03-05 06:59:32 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						73c88b70b2 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-03-01 06:59:21 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						16310b5582 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-02-29 06:59:21 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						fcf16907c7 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-02-27 06:59:29 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kenny Root 
							
						 
					 
					
						
						
							
						
						93b8f941f2 
					 
					
						
						
							
							Revert "Use the new NativeDaemonConnector style."  
						
						 
						
						... 
						
						
						
						The other changes relating to this were already reverted.
This reverts commit 1625c7a837 
						
						
					 
					
						2012-02-25 10:39:07 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dima Zavin 
							
						 
					 
					
						
						
							
						
						906dbea2b4 
					 
					
						
						
							
							libc: Add __aeabi_llsl and __aeabi_llsr to libgcc_compat  
						
						 
						
						... 
						
						
						
						Some platform libraries built for ICS do not work with master
because of some refactoring in frameworks/base.
Make sure that these libgcc symbols are always present in our libc
Change-Id: Ib8d345878be0ba711f051082a778f5cc1f1b3a19
Signed-off-by: Dima Zavin <dima@android.com > 
						
						
					 
					
						2012-02-24 11:38:07 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						f351ae488b 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-02-14 06:59:28 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						8f627eec55 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-02-13 08:56:04 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						bec678c5a7 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-02-08 06:59:26 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						a7bd1bf276 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-02-02 06:59:19 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						a43debbc43 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-02-01 06:59:19 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						3350468499 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-01-31 06:59:17 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						a0b800aba9 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-01-30 06:59:27 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						056daf6a1c 
					 
					
						
						
							
							merge in jb-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-01-25 15:49:01 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						7cad7230ff 
					 
					
						
						
							
							merge in ics-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-01-25 06:59:13 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						70f0e9d86d 
					 
					
						
						
							
							merge in ics-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-01-23 06:59:19 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						cd24e61e57 
					 
					
						
						
							
							merge in ics-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-01-19 06:59:13 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						45af9ba7c4 
					 
					
						
						
							
							merge in ics-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-01-18 06:59:12 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						09670ec2d1 
					 
					
						
						
							
							merge in ics-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-01-17 06:59:15 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						348eea2dbe 
					 
					
						
						
							
							merge in ics-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-01-12 14:11:59 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						13585da4b4 
					 
					
						
						
							
							merge in ics-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-01-09 06:59:16 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						f40d3e7608 
					 
					
						
						
							
							merge in ics-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2012-01-04 06:59:09 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						646ca9f1c9 
					 
					
						
						
							
							merge in ics-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2011-12-21 06:59:12 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						f920b20654 
					 
					
						
						
							
							merge in ics-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2011-12-20 06:59:10 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						fbc3abcbfc 
					 
					
						
						
							
							merge in ics-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2011-12-15 06:59:15 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						3ea9368d92 
					 
					
						
						
							
							merge in ics-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2011-12-14 06:59:15 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						55b9099976 
					 
					
						
						
							
							merge in ics-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2011-12-13 06:59:15 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						d6da8336b8 
					 
					
						
						
							
							merge in ics-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2011-12-08 06:59:13 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						6855359e57 
					 
					
						
						
							
							merge in ics-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2011-12-07 06:59:12 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						04c3d4d709 
					 
					
						
						
							
							merge in ics-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2011-12-06 06:59:14 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						5e7783097a 
					 
					
						
						
							
							merge in ics-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2011-12-01 06:59:15 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						d999c93401 
					 
					
						
						
							
							merge in ics-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2011-11-30 06:59:12 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						86ad80b6be 
					 
					
						
						
							
							merge in ics-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2011-11-28 12:23:08 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						71b9eedbea 
					 
					
						
						
							
							merge in ics-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2011-11-17 06:59:15 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						a938409c0e 
					 
					
						
						
							
							merge in ics-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2011-11-16 06:59:17 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						2f3309c9e3 
					 
					
						
						
							
							merge in ics-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2011-11-15 06:59:11 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						16e818f90b 
					 
					
						
						
							
							merge in ics-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2011-11-06 06:59:20 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						9bf1daaaf9 
					 
					
						
						
							
							merge in ics-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2011-11-01 06:59:13 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								The Android Automerger 
							
						 
					 
					
						
						
							
						
						98873f6540 
					 
					
						
						
							
							merge in ics-release history after reset to master  
						
						 
						
						
						
						
					 
					
						2011-10-25 07:14:09 -07:00