tree c1375bd61e2095a5e9e1109909327c0e6ae1b1ac
parent cd6eaa88e3790eb2647cc6458fe8826f031a0709
parent 71d94efcfb3d651ab2547b4feb51741a0d6f021b
author Hyunyoung Song <hyunyoungs@google.com> 1498525814 -0700
committer Hyunyoung Song <hyunyoungs@google.com> 1498525867 -0700

merged ub-launcher3-dorval-polish, and resolved conflicts
Test: $ make -j 32 dist checkbuild

Bug: 30770233
Bug: 62896294
Change-Id: I032e6a6775bad0b3995750a43ff7ed6482cc2d5d