tree 29cef73b77d618c06b23ff80e9aa038c49821368
parent 9c2e0a4143f63de944786eef04c63e83c8a2e4a1
parent 902620853017f3308e677853b13f5598e64c1c3f
author android-build-team Robot <android-build-team-robot@google.com> 1525721317 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1525721317 +0000

Merge changes from topic "am-4125e029-a507-49e6-9a52-cae6abb2d37d" into ub-launcher3-master

* changes:
  [automerger] Fixes an issue where on resetup of the FloatingHeaderView it defaulted to the main recyclerview even when the work recyclerview was active which resulted in the recyclerview not responding to scroll changes. am: 1a637bee18
  Fixes an issue where on resetup of the FloatingHeaderView it defaulted to the main recyclerview even when the work recyclerview was active which resulted in the recyclerview not responding to scroll changes.