tree 96beaf07307486f6491f022da63ebe381765d1a8
parent e5ec4ac409eb3d3169bb9350dfda51ae7e08291e
parent e3fe3f89ee956e8d7995c569948cb70765ec19b8
author Hyunyoung Song <hyunyoungs@google.com> 1437431847 -0700
committer Hyunyoung Song <hyunyoungs@google.com> 1437431847 -0700

merged ub-launcher3-burnaby, and resolved conflicts

Note1: Verified that following succeeds. $ make -j 32 dist checkbuild
Note2: Verified that the git history of burnaby is (998 commit) is pulled
into mnc-dev packages/apps/Launcher3 git project using gitk.

b/22609402

Change-Id: If20ed77328a71d05a590a7ee2e84d5472d0248ae