tree 986c9d06cb25078fca44fdda8fd01604bb83e3ba
parent 4de0ddc4f16ea7d89f20cac68380f3095fd83f91
parent 8af16760dcb367dc7568ae3736b797cd2c8406c1
author Tony Wickham <twickham@google.com> 1495221422 -0700
committer Tony Wickham <twickham@google.com> 1495221422 -0700

resolve merge conflicts of 8af16760d to ub-launcher3-dorval-polish

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I4cdfeebd09be58270c249429104d91dc9a31b49c