tree 6067e43ec578242e23488ad381c60a1cb21dd192
parent 8126a33acee99be5d90d84a26d688f3309377dad
parent db17bb0732fea4e8fe575f49045449e5b683fd7a
author Dan Albert <danalbert@google.com> 1414363662 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414363662 +0000

am db17bb07: am 27757ed9: Merge "Use the build system\'s STL selection."

* commit 'db17bb0732fea4e8fe575f49045449e5b683fd7a':