tree ba7193825608719276334b9de8bc3a6e5755c2d2
parent ee7684cad00a13fc82519599ad8fab3cfbd6fe8b
parent c46dbe8ac4748a0084b026524ad9e5ac44fb9fde
author Dan Albert <danalbert@google.com> 1412195655 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412195655 +0000

am c46dbe8a: Merge "Use std::sort instead of qsort_r wrapper."

* commit 'c46dbe8ac4748a0084b026524ad9e5ac44fb9fde':
  Use std::sort instead of qsort_r wrapper.