tree 34c8c0f4463bbaa689f9cba22cb8087971bbd87e
parent a42947a6fa271162d92b9c0faa49bd9ef2071434
parent cebcfbce9433c407e495cf5956ed4a77482c6c71
author Tony Wickham <twickham@google.com> 1502390955 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1502390955 +0000

Merge changes from topic 'am-9a69b851-360f-46eb-9a97-9f3b6fb5a05d' into ub-launcher3-master

* changes:
  [automerger] Defer some work until after workspace fade-in am: 2917a8bf2b
  Defer some work until after workspace fade-in