am 8bb154c2: Merge "resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev" into jb-mr1-dev
am 8bb154c2: Merge "resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev" into jb-mr1-dev

* commit '8bb154c272dbd11922d74e882a538ea9af6cd7db':
  Switch widget: Fix ON/OFF option update error

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