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)
commit04c93c66285db111ac7411c35a6d3220bf6031f0
tree77226056eb89f51cc4cd615d1868a40de9881c17
parentcba166d38004482f04b1b406b0a4ec8933daea9d
parentdacdcb9b42f1c6869e06959cb4f6660150c06e26
Merge "Disabling the activate button when paused" into oc-dev
am: dacdcb9b42

Change-Id: Ia9033892369078556d1874fe9fe4b46f4d2bf5a5