Keys rearrangement.
Merge branch 'jellybean' of ssh://github.com/Rebell/android_device_samsung_wave into jellybean