[Merge] lp:~binli/ubuntu/trusty/unity-control-center/unity-control-center.lp1248720-block-power-callback-unless-its-triggered-by-user into lp:ubuntu/trusty/unity-control-center

[Bin Li]

Bin Li has proposed merging lp:~binli/ubuntu/trusty/unity-control-center/unity-control-center.lp1248720-block-power-callback-unless-its-triggered-by-user into lp:ubuntu/trusty/unity-control-center.

Requested reviews:
  Sebastien Bacher (seb128)
Related bugs:
  Bug #1248720 in unity-control-center (Ubuntu Trusty): "Bluetooth ON/OFF button switches OFF automatically"
  https://bugs.launchpad.net/ubuntu/trusty/+source/unity-control-center/+bug/1248720

For more details, see:
https://code.launchpad.net/~binli/ubuntu/trusty/unity-control-center/unity-control-center.lp1248720-block-power-callback-unless-its-triggered-by-user/+merge/270923

cherry picked the patch from lp:unity-control-center

-- 
The attached diff has been truncated due to its size.
Your team Ubuntu branches is subscribed to branch lp:ubuntu/trusty/unity-control-center.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 524288 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20150914/87660dd8/attachment-0001.diff>