| commit | b6327778e024e147145e48853745a23714ae6d53 | [log] [tgz] |
|---|---|---|
| author | Jean-Michel Trivi <jmtrivi@google.com> | Thu Jan 15 18:07:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 15 18:07:08 2015 +0000 |
| tree | d46ab790dd6c03674642b0732bf3977eaa6ee4b9 | |
| parent | 50481146a9a7c214cdeb33921d8e4a6bf0c03f67 [diff] | |
| parent | 1a65d5b3516ba5750e17b3cb5bc64a585b17f69a [diff] |
am 1a65d5b3: (-s ours) Merge "Fix building on modern versions of Xcode and OS X." into lmp-mr1-dev * commit '1a65d5b3516ba5750e17b3cb5bc64a585b17f69a': Fix building on modern versions of Xcode and OS X.