tree 5da242d45a2d344c27fed832c72957ee86c780b3
parent 5660a7dce473e6205d8e3c111a5ff3ff61fbcf77
parent 7c4bd8903885ad25aab6bf18ce961931965aa687
author Hyunyoung Song <hyunyoungs@google.com> 1502291641 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1502291641 +0000

Merge changes from topic 'am-84f3ec58-93f2-4a21-a27f-6d727311e4dc' into ub-launcher3-master

* changes:
  [automerger] Disable adaptive icon drawable parallax effect during drag and drop Bug: 34828147 am: 76bf7f3835
  Disable adaptive icon drawable parallax effect during drag and drop Bug: 34828147