Merge commit 'ba1a0717946c3d49347e663dda73aa3f91e3d642' into eclair-mr2-plus-aosp * commit 'ba1a0717946c3d49347e663dda73aa3f91e3d642': New constants for db upgrade.
Merge commit 'ba1a0717946c3d49347e663dda73aa3f91e3d642' into eclair-mr2-plus-aosp * commit 'ba1a0717946c3d49347e663dda73aa3f91e3d642': New constants for db upgrade.