| commit | 21b3a87fd01c1925aec1d3184cc285be3e66473c | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Wed Jun 25 19:07:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 25 19:07:49 2014 +0000 |
| tree | 8b744da84f841852a9fac2915f17b53885fd2fe3 | |
| parent | d5ee86ecf38915abc5ec90204a9d7354f9828353 [diff] | |
| parent | 3ee7b36798d0f3042ca6198124186cb5e6b7f2bc [diff] |
am 3ee7b367: Merge "Fix the Mac build on x86-64." * commit '3ee7b36798d0f3042ca6198124186cb5e6b7f2bc': Fix the Mac build on x86-64.