tree 70bec9d59a58c630697687dd29a4495301cfdaa6
parent c7a7e058e83dde47089502933de4e7b65aa47734
parent 264f08d8b8a152a9ea2445b05602ea50d90d1f1c
author Dan Albert <danalbert@google.com> 1410538931 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410538931 +0000

am 264f08d8: Merge "Don\'t manually link stlport."

* commit '264f08d8b8a152a9ea2445b05602ea50d90d1f1c':
  Don't manually link stlport.