tree c1144c44e1af85f3a4a6b1c8c3909db9af93f3e9
parent f3958d07a3212306c7a1fdb1f1bb224ff5843b21
parent 39be2f64fdcfe4aded40fa83a4b212bb8a5de1e3
author Dan Albert <danalbert@google.com> 1416525536 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416525536 +0000

am 39be2f64: am d34b6378: Merge "Global C++11 compatibility."

* commit '39be2f64fdcfe4aded40fa83a4b212bb8a5de1e3':
  Global C++11 compatibility.