commit | 12a00ef305c8ef5b2f2c8e361dd09de77ff90d09 | [log] [tgz] |
---|---|---|
author | Dan Albert <danalbert@google.com> | Fri Aug 07 23:30:50 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 07 23:30:50 2015 +0000 |
tree | e3f86ccf55bd5f8f80390c5c0af690854a9c8956 | |
parent | fee5335c4253b4f06632033e24233ad4a45853cb [diff] | |
parent | 4b2e98fc8c257a27a95fecbc859fcc617e2fa827 [diff] |
am 4b2e98fc: Merge "Fix C++14 bitrot." * commit '4b2e98fc8c257a27a95fecbc859fcc617e2fa827': Fix C++14 bitrot.