tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent b13fe892d82a2ccde3e338c426b6cf70aea1e564
parent 822685a8648e91aca6ce35992087c18165d4d609
author Tao Bao <tbao@google.com> 1440646729 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440646729 +0000

am 822685a8: (-s ours) am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++."

* commit '822685a8648e91aca6ce35992087c18165d4d609':