| commit | 2097e9a1491e850545cd0c38522c22dafd2cf6af | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Nov 19 21:55:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 19 21:55:28 2014 +0000 |
| tree | b34b5858918fa096810443e54001213340fee375 | |
| parent | 26d2b64ba84e926e46e8d41214c75461dfeeda78 [diff] | |
| parent | 20860a28c5be013da111cb794c92dae02aa30089 [diff] |
am 20860a28: Merge "Fix building on modern versions of Xcode and OS X." * commit '20860a28c5be013da111cb794c92dae02aa30089': Fix building on modern versions of Xcode and OS X.