tree 6340ba56d987097a5ad04fbf4956cd8d2ac372e4
parent b7ba11a3c803df061c4db82458c60f9cdf8d90be
parent 47295ded48f6e0defdb63e500760901be9525f40
author Winson Chung <winsonc@google.com> 1525974172 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1525974172 +0000

Merge changes from topic "am-11851312-e665-4de2-88e4-10cb14f31d5f" into ub-launcher3-master

* changes:
  [automerger] Fix lock contention while swiping up am: 570432f700
  Fix lock contention while swiping up