tree a0eb1ad9079127a317558716e16c7fdbdfad7cbc
parent 02aa0e4792080bf1b7d88bff4f6e83b569e69a30
parent 9311387a227d7bd894d880b897fb80ca34b39405
author Tony Wickham <twickham@google.com> 1475098828 -0700
committer Tony Wickham <twickham@google.com> 1475098828 -0700

resolve merge conflicts of 9311387 to ub-launcher3-master

Change-Id: I449cd2c91c2906f04ebf844eab2d02befaeb2f4d