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)
commit4e1f44a38623cdc01dd9f31817f02e8ec1daa9f1
tree45a30f25fbf36f3f348bb8dfcc62c13665fc9392
parentc03d9f205473bb425f77da0b26eb0059bdd82032
parent2b5568ceeed11edeb838b1ccfe3cb36e55ff95c4
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
am: 2b5568ceee  -s ours

Change-Id: I978748603bbd40004463c8c096002e8a51a77699