OSDN Git Service

Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
authorSuprabh Shukla <suprabh@google.com>
Wed, 16 Aug 2017 22:15:57 +0000 (22:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 16 Aug 2017 22:15:57 +0000 (22:15 +0000)
am: ba5593db99  -s ours

Change-Id: Ic18241bfdd81f65a2d89bb2e8e1d55d6c75c41bb


Trivial merge