tree cc00c3b26109757d4f62d1a3932263e7f3ccba9d
parent 1b570700cc635748aed45a29baf7be27ecf0db79
parent 9d3055dc472958d660d59257abe16bae2f4e9afd
author Tony Wickham <twickham@google.com> 1529445857 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1529445857 +0000

Merge changes from topic "am-fd839b47-104b-4f3a-a517-fd305a9a6445" into ub-launcher3-master

* changes:
  [automerger] Don't intercept above shelf progress if still animating am: 89126653cd
  Don't intercept above shelf progress if still animating