tree 2aa9d806b2c6f235ea79780f6f5452927fd80df7
parent 4854e292e0cd0eb58bce4488dc849273904d9302
parent 93fa4b677cac9288e936915f15ca8e5f76a4e4b6
author Tao Bao <tbao@google.com> 1440178779 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440178779 +0000

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

* commit '93fa4b677cac9288e936915f15ca8e5f76a4e4b6':
  edify: Switch to C++.