am a4c96aa2: Merge change I88bb16e6 into eclair
am a4c96aa2: Merge change I88bb16e6 into eclair

Merge commit 'a4c96aa2fadb0c8642a2c8da5f8368cc3de06ed0' into eclair-plus-aosp

* commit 'a4c96aa2fadb0c8642a2c8da5f8368cc3de06ed0':
  Fix for 2133391: Allow menu hard key to be disabled in LockScreen on some devices

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base