merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Mar 2010 21:19:51 +0000 (14:19 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Mar 2010 21:19:51 +0000 (14:19 -0700)
commitd04672513351af4eb302692e0f39fd5bd17191cb
tree0ea1cef08bcfedafa705e3374863d51ec69080e1
parent5ffedb22c856ae5731324b43832ab3f5309683f2
parent4ad72f89b12fe0157074a253190f6aa2cbfe15ac
merge from open-source master

Change-Id: I483fedf77d978b1c6e52d73eebc14f011bb9f809
linker/linker.c