tree 7e8ea10ca91d80ccbee7b716c90df1151f0d4a28
parent 1a91065ed6dbd0a3c66d5a7cb22766c81fdde628
parent 19b68add2857e75ab9303c4e32f1abe987d7186d
author Brian Muramatsu <btmura@android.com> 1291070498 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1291070498 -0800

am 19b68add: am 46878a65: Merge "Fix Build" into froyo

* commit '19b68add2857e75ab9303c4e32f1abe987d7186d':
  Fix Build