am 6ddfaa70: Merge change Ia34f0ca9 into eclair-mr2

Merge commit '6ddfaa70c41909595f1e738c54227ab4f6a8c3f9' into eclair-mr2-plus-aosp

* commit '6ddfaa70c41909595f1e738c54227ab4f6a8c3f9':
  Fixing database versioning broken for a brief time in CL 32247