tree ec5c0d190cb22327d8500cd3dfbbe01bc5780ed1
parent ed78d63de23730be2a85b7a55b5646b7dc4b7057
parent 3a38c110a970c443c09df6a529a78f5b02a870dc
author David 'Digit' Turner <digit@android.com> 1305659887 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305659887 -0700

am 3a38c110: Merge "Fix mac build"

* commit '3a38c110a970c443c09df6a529a78f5b02a870dc':
  Fix mac build