tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent 7f774d2774e98e00beacb491d0fd70ef852f8bda
parent 1a42ebc16e68d18394f613145aca7d8fd88f2588
author Tao Bao <tbao@google.com> 1440684837 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440684837 +0000

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

* commit '1a42ebc16e68d18394f613145aca7d8fd88f2588':