tree 2265f5da8c524258a6804b5bea1bba566be38173
parent a8996fddaa06aa9294be345f41e0955f2f7c745f
parent be0d295da912076239a1e112c4b7b94be10cf7af
author Dan Albert <danalbert@google.com> 1411761184 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411761184 +0000

am be0d295d: am 19d686ee: Merge "Don\'t manually link stlport."

* commit 'be0d295da912076239a1e112c4b7b94be10cf7af':
  Don't manually link stlport.