| commit | 4413c1c6f6d33f3f150004f537a43d3c37cd8ba1 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:53:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:53:54 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | c9a7329c28ecd5ff4746efeb4d34da850c39c49c [diff] | |
| parent | 587b267518e780bc31e134b3efffa1dd7c0aa470 [diff] |
am 8528d9cf: (-s ours) am 8025096e: am 28595721: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in system/core." * commit '8528d9cfb4ee36c0ffe30b15729873211240e449':