tree 10d4b58b229952ddba74c998b454b67ce35c5662
parent d7fec557ad20d08a8f25664c0882c31955dfa73a
parent 1e66abfe504f1e2cb1419336c314d45a20008102
author Dianne Hackborn <hackbod@google.com> 1254272868 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254272868 -0700

am d135b093: (-s ours) Fix broken build. (do not merge)

Merge commit 'd135b0937875b405a20f735189040d5cb4d2546d' into eclair

* commit 'd135b0937875b405a20f735189040d5cb4d2546d':
  Fix broken build. (do not merge)