tree 41f6eaada8de57f11eabd573f351490d1abe9f52
parent a9a50fef97d388ef5fb06a5953caaa79ab16496d
parent dbbdcf3fd817128f89474f9ea8c84743fc648a1a
author Tao Bao <tbao@google.com> 1440181217 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440181217 +0000

am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++."

* commit 'dbbdcf3fd817128f89474f9ea8c84743fc648a1a':
  edify: Switch to C++.