tree bd6d326031656e18a037e22b48990ed51783b470
parent 2d687fe3d8af29e79ee13e5d6c3d71113d6f575a
parent 19d686ee9340c81c23083fc30bc012f7f6ed5028
author Dan Albert <danalbert@google.com> 1411760728 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411760728 +0000

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

* commit '19d686ee9340c81c23083fc30bc012f7f6ed5028':
  Don't manually link stlport.