commit | 910f4fb003b8b1db2a1caebec768c01b4afb09bc | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Aug 16 19:51:50 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 16 19:51:50 2017 +0000 |
tree | 78772c275936dc7bb97731c665639b7b75006663 | |
parent | db8682996dea8b2d0400700c42b98633c2a5c000 [diff] | |
parent | 9f458c77fd359d1ed3a07ed589a56b826d0d6888 [diff] |
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