| commit | fc2bd658fef7d8864aa13a3a6545ce8d2fcee5d4 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:40:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:40:25 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | d4c2908033ec3b39325879d2086fafb382a26a52 [diff] | |
| parent | 5f6375440b1b624d79882d3550825d59c82ca168 [diff] |
am 32cfa952: (-s ours) am 099ec31b: am ff201659: Merge "Fix the Mac libcutils build." * commit '32cfa9527136665689818399771174b5e25d32ba':