tree 799f9fec1680a4bb9221408ddaff6b771e56a7c7
parent b685d10edbc3958d494ca9f663a2a7d1eb421eed
parent a616d2b0e2fbcd1379385abeae6b8be7effca6f5
author Sunny Goyal <sunnygoyal@google.com> 1497300934 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1497300935 +0000

Merge "resolve merge conflicts of 5cc7bbdbb to ub-launcher3-dorval-polish" into ub-launcher3-dorval-polish