| commit | f840ff7feb4483eec94b4ae4431aefa42619e9a9 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:36:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:36:28 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 451adc55bbafa4b5f5f84a071c14434c3c9fbb84 [diff] | |
| parent | fc76945cccc1734d70438356f916176fe827160b [diff] |
am ef98e58e: am 6cec026e: (-s ours) am 8c86e4e2: am d0cae5b9: Merge "Remove a HAVE_MS_C_RUNTIME I missed." * commit 'ef98e58e9eda2d00da3cc4dfb1b78c4b04f6242b':