OSDN Git Service

Merge "Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Wed, 16 Aug 2017 19:51:50 +0000 (19:51 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 16 Aug 2017 19:51:50 +0000 (19:51 +0000)
commit910f4fb003b8b1db2a1caebec768c01b4afb09bc
tree78772c275936dc7bb97731c665639b7b75006663
parentdb8682996dea8b2d0400700c42b98633c2a5c000
parent9f458c77fd359d1ed3a07ed589a56b826d0d6888
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