OSDN Git Service

am 8a47f6d3: am f2bdac77: Merge "Never use stlport on the host."
authorDan Albert <danalbert@google.com>
Thu, 16 Oct 2014 18:10:22 +0000 (18:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Oct 2014 18:10:22 +0000 (18:10 +0000)
* commit '8a47f6d3192140646d0d057c371b17e487fc2a77':
  Never use stlport on the host.


Trivial merge