OSDN Git Service

Merge "Disabling the activate button when paused" into oc-dev
authorSuprabh Shukla <suprabh@google.com>
Tue, 30 May 2017 23:12:10 +0000 (23:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 30 May 2017 23:12:10 +0000 (23:12 +0000)
am: dacdcb9b42

Change-Id: Ia9033892369078556d1874fe9fe4b46f4d2bf5a5


Trivial merge