tree e61b877633207260e2c671b2eec39c42281e1fc0
parent 51e4f0f8eefb6d31227be8f7539c972f09c8db95
parent e5bb705fb79f18df8680958dcf2c5460e16c90b6
author Sunny Goyal <sunnygoyal@google.com> 1438372388 -0700
committer Sunny Goyal <sunnygoyal@google.com> 1438372388 -0700

resolved conflicts for merge of e5bb705f to ub-launcher3-master

Change-Id: Id7ec170a3c4b1415b18ad46a18d7ea69595a8992