commit | 5b0156c7103dcdc049d1a49a2d3d8150961034e6 | [log] [tgz] |
---|---|---|
author | Stephen Hines <srhines@google.com> | Thu Aug 27 10:50:25 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:50:25 2015 +0000 |
tree | ebd4d739215332e242fa5cba88f95c0791873d42 | |
parent | c22fb350857152306917d0ed559db53e883a0d40 [diff] | |
parent | 99e38a0a4784dd7418e7b6c82cfb42751b8941e4 [diff] |
am 99e38a0a: (-s ours) am 8dd532d6: am 460cb4ba: Merge "Update Slang for LLVM rebase to r239765" * commit '99e38a0a4784dd7418e7b6c82cfb42751b8941e4':