tree 86e662d4d49df5a957df33d65e35988ecb23e6af
parent 2e70cb081f89d4a6932025b7e46af9d92c681d27
parent b46aa4a39f8b4da0fbd941ed0c26b046da7f19af
author Tony Wickham <twickham@google.com> 1501106831 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501106831 +0000

Merge changes from topic 'am-62871b14-7da8-4b31-b420-c5c87d1477d2' into ub-launcher3-master

* changes:
  [automerger] Handle null background or foreground when dragging adaptive icons am: 746c6c36b6
  Handle null background or foreground when dragging adaptive icons