tree 6f1222331760dc5a743d606ebfdfc893bf2fa3a8
parent 705402b4db5efc0cc09175d25e21db21765440ea
parent 09204172b33cf7fa88662f2871f872bf666822a4
author TreeHugger Robot <treehugger-gerrit@google.com> 1493319178 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1493319179 +0000

Merge "[MANUAL] resolve merge conflicts of 59c0e0e91 to ub-launcher3-dorval-polish" into ub-launcher3-dorval-polish