tree 7005b87f3389e9e3f850e08af723755f012ae765
parent 1311f4d2ea82da813506821e7c83672cd46826f9
parent 98ff38aa48b4c9d3e33c128fae2d5c851e49a3eb
author Hyunyoung Song <hyunyoungs@google.com> 1436822619 -0700
committer Hyunyoung Song <hyunyoungs@google.com> 1436822619 -0700

resolved conflicts for merge of 98ff38aa to ub-launcher3-master

Change-Id: Ie43d7215e604758936c558b79d191f1b26bb31f8