tree 77226056eb89f51cc4cd615d1868a40de9881c17
parent cba166d38004482f04b1b406b0a4ec8933daea9d
parent dacdcb9b42f1c6869e06959cb4f6660150c06e26
author Suprabh Shukla <suprabh@google.com> 1496185930 +0000
committer android-build-merger <android-build-merger@google.com> 1496185930 +0000

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

Change-Id: Ia9033892369078556d1874fe9fe4b46f4d2bf5a5