tree 6fbfe2482e1b1e3ad508ca26b507fdd369c9d294
parent 17bf5a992b66d9f1b57f11a5ccd698f90f68262f
parent b3ee578cbbc714ad2a418f8971a30519ebed9173
author Sunny Goyal <sunnygoyal@google.com> 1524271711 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1524271711 +0000

Merge changes from topic "am-096a9064-cfc3-4638-8dd5-377d3dbdbd89" into ub-launcher3-master

* changes:
  [automerger] Fixing flakiness in shape detection am: 6275b0ae7e
  Fixing flakiness in shape detection