tree b42974010a074685a5d350ae2a407ae863d610e8
parent cf407455e6472bc1d461b01cc9fbbde1831b4b78
parent a8eda90c95ffb591f74e733395c2e11c7f55993e
author Sunny Goyal <sunnygoyal@google.com> 1528405061 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1528405061 +0000

Merge changes from topic "am-b4ccc74b-9fac-466f-997f-63416774e49c" into ub-launcher3-master

* changes:
  [automerger] Do not execute controller callbacks, if controller is null am: aa168d5c11 am: a4785c9a3f
  [automerger] Do not execute controller callbacks, if controller is null am: aa168d5c11
  Do not execute controller callbacks, if controller is null