tree d0754c77c90060886cab169d0b22aae616fc2587
parent 8d84b6f9f576fe51b2cb4a54042bf95af923e55b
parent c894c2045f589571c80af0648e7a9dcd7e97b6a8
author Dan Albert <danalbert@google.com> 1416524448 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416524448 +0000

am c894c204: Merge "C++11 compatibility."

* commit 'c894c2045f589571c80af0648e7a9dcd7e97b6a8':
  C++11 compatibility.