| commit | fc76945cccc1734d70438356f916176fe827160b | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:54:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:54:07 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | ef09996ceec9d1c1296541858957635986f0d2b6 [diff] | |
| parent | 2e1102f63e857f223427f93e39cc1e1bf1f87277 [diff] |
am 6cec026e: (-s ours) am 8c86e4e2: am d0cae5b9: Merge "Remove a HAVE_MS_C_RUNTIME I missed." * commit '6cec026e86c4f243bb3149e44546a41006e817d6':