tree 77158f2bcd0f4f814667390954cde6c160417110
parent e57ca0ec07f357a1ef38d9a7439ea080bada4e74
parent dbbdcf3fd817128f89474f9ea8c84743fc648a1a
author Tao Bao <tbao@google.com> 1440181452 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440181452 +0000

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

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