tree d264f3c56fa7a0561f32d72dd13706fbda018c7e
parent 6ddddda63fdb2acedd17e06029f8cb5377fb9476
author Steve Block <steveblock@google.com> 1261075717 +0000
committer Steve Block <steveblock@google.com> 1261075893 +0000

Fixes the build break in master.

The new WebKit merge caused a build break when auto-merged from eclair-mr2 to
master, due to the fact that master uses stl_port.

Change-Id: I1437352a3439f3e103572ed3e1bb523ec65e98ef