tree 51aa70bb9e74bcc7cd902171a4606a73e9f7a527
parent 0956427aa995561acb4471764158ae057a36dad5
parent fc1ae3a192abc1e340f5de90e88c2460121f013f
author Dan Albert <danalbert@google.com> 1411763900 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1411763901 +0000

Merge "Don't manually link stlport."