tree 26607083342c958c73614d11e0dd4935005fc4b4
parent 917f4a44cb221ac51784e0bfde3a90e0e73bc46d
parent 26b1746593851e239bfff65ae7a69b809ad87b99
author Tony <twickham@google.com> 1490922605 -0700
committer Tony <twickham@google.com> 1490922605 -0700

resolve merge conflicts of 26b174659 to ub-launcher3-master

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