tree bd566a99666bee40939ec72da9e24ebef8b46337
parent 78901bd6fdb0d3600a94f79b27c41224f7f5a241
parent 7f17dff221008bad170ad266bca05db65a3888b9
author Ying Wang <wangying@google.com> 1334692061 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1334692061 -0700

Merge "Fix Mac build."