Merge commit 'dccf22dcea384e65ae54456122b5c660e6fefe00' into eclair-plus-aosp * commit 'dccf22dcea384e65ae54456122b5c660e6fefe00': Fix the shortcuts
Merge commit 'dccf22dcea384e65ae54456122b5c660e6fefe00' into eclair-plus-aosp * commit 'dccf22dcea384e65ae54456122b5c660e6fefe00': Fix the shortcuts