tree 6067e43ec578242e23488ad381c60a1cb21dd192
parent d0388a36b67665be55162388337055ee21a43206
parent 27757ed969c75ac5d6ec2eb6bbea0a12b2d1b700
author Dan Albert <danalbert@google.com> 1411085561 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411085561 +0000

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

* commit '27757ed969c75ac5d6ec2eb6bbea0a12b2d1b700':
  Use the build system's STL selection.