tree 2a00f5ea78c2cf494d93d45e72211cacacffde83
parent 8385e7188d66f632ac471ce3750bae3c199740bc
parent fb4014daa38977ba7cb35f32edfe1307f3ab4243
author Winson <winsonc@google.com> 1445039269 -0700
committer Winson <winsonc@google.com> 1445039269 -0700

resolve merge conflicts of fb4014daa3 to ub-launcher3-master.

Change-Id: I6d84a7f3fad757bf139b6ea0001ac6ab88850996