am 95a2ff7c: Merge "Adding a couple extras keys for keyguard widget selection" into jb-mr1-dev
am 95a2ff7c: Merge "Adding a couple extras keys for keyguard widget selection" into jb-mr1-dev

* commit '95a2ff7cb40d5eb3ca6fe4df0282f45e63d76ae2':
  Adding a couple extras keys for keyguard widget selection

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