tree 652abc5e38c01c86ac3c4dc938c3b1fe36ade073
parent 7515f1b41c8a857b076490b170cd074086da4cd3
parent 078d4de90b2a759e2fe465763f8a95bbf13592bb
author Sunny Goyal <sunnygoyal@google.com> 1456420904 -0800
committer Sunny Goyal <sunnygoyal@google.com> 1456420904 -0800

resolve merge conflicts of 078d4de90b to ub-launcher3-calgary

Change-Id: Iec05a686848a03fa76a893d33fa4c465f00e8a71