tree b1d90b402d0977bdcae0e7d73869faf0aec27ba2
parent fc9a3486a25ebe8140bb17e835eafce2b110978e
parent 1845049c6652a43bd3e95fe01748d24949e9fc06
author Winson <winsonc@google.com> 1444248270 -0700
committer Winson <winsonc@google.com> 1444248270 -0700

resolved conflicts for 1845049c to ub-launcher3-master

Change-Id: I25a01a0735be754f4c8daef5a4a04eaec651b95c