| commit | 672e0d8d8ce3d8f81a401a3ada06379dbed670c3 | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Wed Jun 25 20:45:51 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 25 20:45:51 2014 +0000 |
| tree | e586b632cd97cd6e22e44d73e2c4de3365238cea | |
| parent | b899341df8723ae811d02f18a8644f1d6a17f929 [diff] | |
| parent | 21b3a87fd01c1925aec1d3184cc285be3e66473c [diff] |
am 21b3a87f: am 3ee7b367: Merge "Fix the Mac build on x86-64." * commit '21b3a87fd01c1925aec1d3184cc285be3e66473c': Fix the Mac build on x86-64.