tree 93de0ffd1c4245b830d1be97ed000c0f6d2b1de4
parent 0d4c52358a1af421705c54bd8a9fdd8a30558a2e
parent 6b7a3811a250967cd755499909e3c7838b90e46b
author Dan Albert <danalbert@google.com> 1411763892 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1411763893 +0000

Merge "Don't manually link stlport."