tree ee95ab35a9b791a5fd17a9685321e64ac027ad5e
parent 87c1a14ef1ed1a99d5f6c0965dd943134ab487f5
parent a4785c9a3fa40b8727b31873364687beb5a4149c
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-edmonton-polish

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