tree 318d40848b47ab31d55f1ab569d3e53a7966fcc1
parent 08382e1e2cae7d0bdf94c493edd24a2644de9b5d
parent 42a6c75463a3b4590dbc9a3483222f3478342367
author David 'Digit' Turner <digit@android.com> 1305660089 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305660089 -0700

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

* commit '42a6c75463a3b4590dbc9a3483222f3478342367':
  Fix mac build