tree 7709815140dee589113d284e4fdc5b1e3efbfaad
parent 1c3dc4cf4de404f76dbefc57e86b66121149e6e3
parent 1268855200e519985e2c845ba84d2d613fa4a36c
author Winson <winsonc@google.com> 1441843889 -0700
committer Winson <winsonc@google.com> 1441843889 -0700

resolved conflicts for 12688552 to ub-launcher3-master

Change-Id: Iaf97c5ae486e19cd3ad320ed88346571252d878a