| commit | 29e5c37525f11f30870a61b0fc5c397c6adf5544 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:38:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:38:44 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 8f30b6aa9c7a530f3b736b3013b72b1e14dc3dca [diff] | |
| parent | 2364bc2ca2c7b3abf9ee54cb66d103b14eb3aac9 [diff] |
am bc8c2275: am 1533f95b: (-s ours) am 615af25f: am a421c1e5: Merge "Possible Mac build fix." * commit 'bc8c227529796216e78fc6d4fe1ebff1a07b2381':