tree da17e72745e9cea493266ea5ee709b37387b9386
parent 6d55202c9bf4e7181cf5a34772a070d4941b6de0
parent 7092db02410562026da17a7b38f48025cc847de2
author Tony Wickham <twickham@google.com> 1496962147 -0700
committer Tony Wickham <twickham@google.com> 1496962147 -0700

resolve merge conflicts of 7092db024 to ub-launcher3-dorval-polish

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