| commit | 1a42ebc16e68d18394f613145aca7d8fd88f2588 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Thu Aug 27 03:38:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 03:38:49 2015 +0000 |
| tree | 69d6a47242f47951fc81617abee8d63d8b26de93 | |
| parent | b13fe892d82a2ccde3e338c426b6cf70aea1e564 [diff] | |
| parent | 822685a8648e91aca6ce35992087c18165d4d609 [diff] |
am 822685a8: (-s ours) am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++." * commit '822685a8648e91aca6ce35992087c18165d4d609':