am 2113fb14: Merge "Don\'t manually link stlport."
authorDan Albert <danalbert@google.com>
Fri, 26 Sep 2014 19:53:00 +0000 (19:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 26 Sep 2014 19:53:00 +0000 (19:53 +0000)
commitac54747553a547b520a3ba9a9a3654124bc22e09
treeba91a12f5442dde3936440619667ae07889ddb93
parent0b7b68d5e2898d0a8e199a0b74f0d9c38a6e0c1c
parent2113fb14d60becb6d419513f3752d4efa2f6a4cc
am 2113fb14: Merge "Don\'t manually link stlport."

* commit '2113fb14d60becb6d419513f3752d4efa2f6a4cc':
  Don't manually link stlport.