tree e35d1f0c3fde6a154ba0b3120e7e7204e77d01fe
parent 0f9a91c94fa9f3b0082744efe2457528ef19fa62
parent cd7c775ece6854765ae3208818e76d9d11724713
author Joe Onorato <joeo@android.com> 1283284856 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283284856 -0700

am cd7c775e: fix the build still

Merge commit 'cd7c775ece6854765ae3208818e76d9d11724713' into gingerbread-plus-aosp

* commit 'cd7c775ece6854765ae3208818e76d9d11724713':
  fix the build still