tree 8453c030e0ca14fc1cba9156eaa758c0ded3290e
parent 1e92b1fd0582adeea533b05d9423907239ca9069
parent 8dd56b7e44d3d51ef621ef2096f807f97396db01
author Hyunyoung Song <hyunyoungs@google.com> 1493964321 -0700
committer Hyunyoung Song <hyunyoungs@google.com> 1494450990 -0700

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

Merged-In: I3da7113926cdcb933707b3864c4334223c11e25b
Merged-In: If9b11b212852cb1048d54db2224dab4acf2d93e0

Test: make -j 32 dist checkbuild

Change-Id: I7e12afdf66a892654a06b77f7fc625a93554d1e7