OSDN Git Service

Merge "Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am...
authorSuprabh Shukla <suprabh@google.com>
Wed, 16 Aug 2017 20:21:50 +0000 (20:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 16 Aug 2017 20:21:50 +0000 (20:21 +0000)
am: 910f4fb003  -s ours

Change-Id: I93e8414e389d054a537ae87f482bfdb0623a4a1e


Trivial merge