tree e07ea6b44a0f7445ca00080a23f9254a120c5b91
parent 00c95b84472a8af8153b389805b7cedf5a5be28a
parent c51a2964fb9de56c6a8bb2875164c2992c676927
author Jonathan Miranda <jonmiranda@google.com> 1507318913 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1507318913 +0000

Merge changes from topic "am-01ff3d34-0eea-44d5-99f7-af2df518afb2" into ub-launcher3-master

* changes:
  [automerger] Fix bug where labels were visible in hotseat / invisible in workspace. am: f1eae802b5
  Fix bug where labels were visible in hotseat / invisible in workspace.