Merge commit '8426319c5a5f4b6b7a1d5940e78d3fc717c36d98' into eclair-mr2-plus-aosp * commit '8426319c5a5f4b6b7a1d5940e78d3fc717c36d98': Prevent crash in Home when using widgets whose ids collide with Home's
Merge commit '8426319c5a5f4b6b7a1d5940e78d3fc717c36d98' into eclair-mr2-plus-aosp * commit '8426319c5a5f4b6b7a1d5940e78d3fc717c36d98': Prevent crash in Home when using widgets whose ids collide with Home's