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