tree 77158f2bcd0f4f814667390954cde6c160417110
parent 62551d4a7412eb5fab0022e26399d56e6ddfafe6
parent f0355aebe8bc833a6d287e11bf8cc9a56c43d32d
author Tao Bao <tbao@google.com> 1440181889 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440181889 +0000

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

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