tree 731b22fe6a6647bdabbf1c349d22c9b8e8eec858
parent f3d85741819eb5a78c660b829c9e94fccf107be3
parent 132033c5b8ee41b3181699e4997aad9601549cc8
author Dan Albert <danalbert@google.com> 1431533342 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431533342 +0000

am 132033c5: am 939e5a0f: am a1e55c5f: Merge "Fix using libc++_static in dynamic binaries."

* commit '132033c5b8ee41b3181699e4997aad9601549cc8':
  Fix using libc++_static in dynamic binaries.