tree c8cfbbb455b7ff26e1d48fccea8e148b09fb6fd7
parent d3800208aa8c4f5926502ccb8e49e13501b441c9
parent 78564d4e2ddb4f8aba481b6943c155e121b41a7f
author Winson Chung <winsonc@google.com> 1434662770 -0700
committer Winson Chung <winsonc@google.com> 1434662850 +0000

resolved conflicts for merge of 78564d4e to ub-launcher3-burnaby

Change-Id: I9e302b223dff1f238d720026e20b64315b61b293