Merge commit 'fdf53a4628f915203752660aa07049aa22c01b5a' into eclair-plus-aosp * commit 'fdf53a4628f915203752660aa07049aa22c01b5a': Fix bug 2129190
Merge commit 'fdf53a4628f915203752660aa07049aa22c01b5a' into eclair-plus-aosp * commit 'fdf53a4628f915203752660aa07049aa22c01b5a': Fix bug 2129190