tree fdf9c54881924c27f873d8472f4965f27092c838
parent c9c834f9f35a54ee110bf07182ee03eabb2e9bad
parent d135b0937875b405a20f735189040d5cb4d2546d
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)