tree fe10a6473b1052f90d787f59b0fb9d1ff68e7c45
parent 5093ee206b080ccb34aa8967d62399ae17039cbc
parent ca5719780b4a9a4b8f171393f74644e6654c1bab
author Sunny Goyal <sunnygoyal@google.com> 1430332106 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430332106 +0000

am ca571978: Merge "Updating drop target assets" into ub-launcher3-burnaby

* commit 'ca5719780b4a9a4b8f171393f74644e6654c1bab':
  Updating drop target assets