| commit | 1d1421b710fb2ecd674c9a65a65a190dbe2df528 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:36:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:36:15 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | b5df054a559ed25857c0c1c8927ff444e9e0835e [diff] | |
| parent | 4413c1c6f6d33f3f150004f537a43d3c37cd8ba1 [diff] |
am 73d7e780: am 8528d9cf: (-s ours) am 8025096e: am 28595721: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in system/core." * commit '73d7e7802958df753fe91d3c89234c7f93abf988':