tree 06cf1a55d966bf8fe8184576a85b683a02e25bdf
parent 43d015643b001b0835227c60a3932833dcbb3ed9
parent fceb9ff0f5855432763d5dc15eeff8e7ce4df0c0
author Hyunyoung Song <hyunyoungs@google.com> 1461177660 -0700
committer Hyunyoung Song <hyunyoungs@google.com> 1461177660 -0700

merged ub-launcher3-burnaby-nyc, and resolved conflicts
b/28269144
Change-Id: Ie884be65901b8d9c6a912944094b8c45796162ee