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)
commit2b5568ceeed11edeb838b1ccfe3cb36e55ff95c4
tree4ad38c7b4b344eb288cc059a7ca7c844eec7272a
parentdb196570518c23f25cfb54036cc6e4089a6e5460
parent910f4fb003b8b1db2a1caebec768c01b4afb09bc
Merge "Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52 am: 616c84ccb0  -s ours am: aedf7cdfdb  -s ours am: f52c8ccbfc  -s ours" into oc-dr1-dev-plus-aosp
am: 910f4fb003  -s ours

Change-Id: I93e8414e389d054a537ae87f482bfdb0623a4a1e