tree 1684f98646e50e761f6d08037b36821f8584ca17
parent 7d747db6b1248d27d51d673ea3146b1294acbd67
parent 8fc94823cfd7f9f2403f1ad553d84544252c7849
author David 'Digit' Turner <digit@android.com> 1305660230 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305660230 -0700

am 8fc94823: am 42a6c754: am 3a38c110: Merge "Fix mac build"

* commit '8fc94823cfd7f9f2403f1ad553d84544252c7849':
  Fix mac build