tree cf3ec6403cc23fcd131f5496764c2780f28af063
parent 4127770903dfb973e7adacbd7c026e63708aed7c
parent 9be47e8eae0419855973da1ce408f107bc6c2d45
author Sunny Goyal <sunnygoyal@google.com> 1429303257 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429303257 +0000

am 9be47e8e: Merge "Updating drop button targets" into ub-launcher3-burnaby

* commit '9be47e8eae0419855973da1ce408f107bc6c2d45':
  Updating drop button targets