| commit | 43561cf724a18fbb1fb89eb9b0e52180b3d3446f | [log] [tgz] |
|---|---|---|
| author | Miao Wang <miaowang@google.com> | Wed Oct 14 01:27:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 14 01:27:51 2015 +0000 |
| tree | 5e01bc6048904d8774fb0cb2b1150eb9c6304126 | |
| parent | 82192966cb3893a5e5dd7e81c63f016866f89f5b [diff] | |
| parent | 050c66aa7d52f0f0203c59d1a5020570d28ae687 [diff] |
am 050c66aa: resolved conflicts for 3db22d4d to mnc-dr-dev-plus-aosp * commit '050c66aa7d52f0f0203c59d1a5020570d28ae687': Fix llvm-rs-cc.exe crash for windows