OSDN Git Service

Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c4...
authorSuprabh Shukla <suprabh@google.com>
Wed, 16 Aug 2017 19:48:33 +0000 (19:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 16 Aug 2017 19:48:33 +0000 (19:48 +0000)
am: aedf7cdfdb  -s ours

Change-Id: I95b94ed593f31067244d5d7bd795fe734cba971a


Trivial merge