OSDN Git Service

Merge "Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am...
authorSuprabh Shukla <suprabh@google.com>
Wed, 16 Aug 2017 22:12:55 +0000 (22:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 16 Aug 2017 22:12:55 +0000 (22:12 +0000)
am: 2b5568ceee  -s ours

Change-Id: I978748603bbd40004463c8c096002e8a51a77699


Trivial merge