tree 7f9622b0e83c4f4fd2ebd40134140d5f1aac44a2
parent b347535cb09c5a7bebf0c928d9842236e43cd4b5
parent a6194d3d9205488d6f5400193f8d4d6aaf140218
author Sunny Goyal <sunnygoyal@google.com> 1455909134 -0800
committer Sunny Goyal <sunnygoyal@google.com> 1455909134 -0800

resolve merge conflicts of a6194d3d92 to ub-launcher3-calgary

Change-Id: I29b3c3bb2c070e34c78c62b8f9086e6f3c8bd277