tree 3acc3dbaa19350783d9b8b7f5ca803b999792510
parent 75b841b05be8d816b3421dac2b4ea964e03bf97c
parent 5cfde85cb6d095585b932d9e3e2c4fe78aa0dafe
author Hyunyoung Song <hyunyoungs@google.com> 1494448574 -0700
committer Hyunyoung Song <hyunyoungs@google.com> 1494460281 -0700

merged ub-launcher3-dorval, and resolved conflicts

Bug: 36904684
Bug: 37929893
Bug: 36068989

Test: make -j 32 dist checkbuild

Change-Id: I3da7113926cdcb933707b3864c4334223c11e25b