am 642258a2: Merge "Tweaking how settings adds keyguard widgets" into jb-mr1-dev
am 642258a2: Merge "Tweaking how settings adds keyguard widgets" into jb-mr1-dev

* commit '642258a29b426b14da509df3a5ed912673feeb57':
  Tweaking how settings adds keyguard widgets

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