tree 31bdb7439cc193b89b3512bc329a8d760ca1b534
parent 87be28a67b12c5b12a89155c794c0ddd438e8750
parent 107fe60f6ef5b3336ece35122650d9ccc1c69913
author Tony Wickham <twickham@google.com> 1597450836 +0000
committer Tony Wickham <twickham@google.com> 1597450844 +0000

resolve merge conflicts of 107fe60f6ef5b3336ece35122650d9ccc1c69913 to ub-launcher3-master

Change-Id: I9a1c52e66edd627fd54cc3cb423fa28a6175f8ac