| commit | 6309cb35f79188319429a6110a10bd933136421b | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Nov 19 22:00:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 19 22:00:18 2014 +0000 |
| tree | ad1a6a675264264644c266ee35f70bdb4a128d00 | |
| parent | 29e142760d238476943ca7afcc3bebe937a524ff [diff] | |
| parent | 2097e9a1491e850545cd0c38522c22dafd2cf6af [diff] |
am 2097e9a1: am 20860a28: Merge "Fix building on modern versions of Xcode and OS X." * commit '2097e9a1491e850545cd0c38522c22dafd2cf6af': Fix building on modern versions of Xcode and OS X.