tree 5d7c55f1616972707c0966ff5cdfc25015df4c13
parent dbfc9014feab2acad5db788f09f35723d4e4d0a1
parent cf895ccc2c7b0ca82f5ccde9f7cb78a8f7a0836e
author Tony Wickham <twickham@google.com> 1492727738 -0700
committer Tony Wickham <twickham@google.com> 1492729531 -0700

resolve merge conflicts of cf895ccc2 to ub-launcher3-master

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