| commit | c9edc0797779187ad1b429e956820928051047ae | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Mar 21 16:19:29 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 21 16:19:29 2013 -0700 |
| tree | f21b89200a2bfa44329c1f2588ad4cdf9d7c62de | |
| parent | f46e14544b446e6dbc241aabb8090cd8e62c158d [diff] | |
| parent | 39e2a408a64bd24fb0fe7f5eb444b55af1160480 [diff] |
am 39e2a408: am 6eb978c9: Merge "Expose wait4 as wait4 rather than __wait4." * commit '39e2a408a64bd24fb0fe7f5eb444b55af1160480': Expose wait4 as wait4 rather than __wait4.