tree 001a6636ce1d55bd2e31ea69aa4ed2202591795d
parent 090ce68ceecc09780db4797277a3aaf8c7546a0b
parent 5cfde85cb6d095585b932d9e3e2c4fe78aa0dafe
author Hyunyoung Song <hyunyoungs@google.com> 1494449630 -0700
committer Hyunyoung Song <hyunyoungs@google.com> 1494460367 -0700

merged ub-launcher3-dorval, and resolved conflicts
Bug: 36904684
Bug: 37929893
Bug: 36068989

Test: make -j 32 dist checkbuild
Change-Id: If9b11b212852cb1048d54db2224dab4acf2d93e0