merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 May 2010 16:22:50 +0000 (09:22 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 May 2010 16:22:50 +0000 (09:22 -0700)
Change-Id: Iecfd2bd3069f70bbe508042cc249fcf7ff24800d

1  2 
linker/linker.c

diff --cc linker/linker.c
Simple merge