From: Suprabh Shukla <suprabh@google.com>
Date: Tue, 30 May 2017 23:12:10 +0000 (+0000)
Subject: Merge "Disabling the activate button when paused" into oc-dev
X-Git-Tag: android-x86-9.0-r1~852^2~44
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=04c93c6628;p=android-x86%2Fpackages-apps-Settings.git

Merge "Disabling the activate button when paused" into oc-dev
am: dacdcb9b42

Change-Id: Ia9033892369078556d1874fe9fe4b46f4d2bf5a5
---

04c93c66285db111ac7411c35a6d3220bf6031f0