tree cd1c3dbacdbe1fbde7b8c79a3ad34ae41cfffeb6
parent a3b240d32bf9e65b4ba80b28ad28eef0a1fd677b
parent 850de64c0d0985fb6fe9bbe7c276370c8b13c839
author Winson <winsonc@google.com> 1443573577 -0700
committer Winson <winsonc@google.com> 1443573577 -0700

resolved conflicts for 850de64c to ub-launcher3-master

Change-Id: Ica4893082f03afe76abd42dca44016eb9e436c35