tree 47a1db21c718685efcedaa12ab912052a406a6f7
parent 8886108aa4b37a7409ff3b0ea61cd6c501b7faf5
parent a102d71cc550503391dc74cfb26abe09deb93957
author Tony Wickham <twickham@google.com> 1525278081 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1525278081 +0000

Merge changes from topic "am-0087df7e-ff8b-487b-846d-9dc2f096ec07" into ub-launcher3-master

* changes:
  [automerger] Gracefully handle some edge cases in quick scrub am: f47e5ce3cf
  Gracefully handle some edge cases in quick scrub