tree 2c5f26dd1e0d19aa61b6051076683dcbeadf5274
parent 81284287a761a9ee512bd7d4857995fdd8d8dcbc
parent e1899e44368f7602afc5b87a75102e7ff551982c
author Sunny Goyal <sunnygoyal@google.com> 1443468118 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443468118 +0000

am e1899e44: Merge "Adding size check when generating holographic outline" into ub-launcher3-burnaby

* commit 'e1899e44368f7602afc5b87a75102e7ff551982c':
  Adding size check when generating holographic outline