| commit | 43da056726394eb387d9aa60ea061b272dc0326c | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:26:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:26:35 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 52e3b090c75ff52e270ffa0768458cab76c738ba [diff] | |
| parent | fc2bd658fef7d8864aa13a3a6545ce8d2fcee5d4 [diff] |
am 9ecbf3b8: am 32cfa952: (-s ours) am 099ec31b: am ff201659: Merge "Fix the Mac libcutils build." * commit '9ecbf3b8f96de540a1bbbcae7d511411f48fef40':