tree 13d2d13a7dd73919e095510ee690dceb8abaff6f
parent c5027ce20d5e86c62cb1d0a5cb9778af108e0334
parent 40f875679387c0f6f908428d0142eacefeda0247
author Hyunyoung Song <hyunyoungs@google.com> 1574202237 -0800
committer Hyunyoung Song <hyunyoungs@google.com> 1574202237 -0800

Merge commit '40f875679387c0f6f908428d0142eacefeda0247'

This CL adds git history that is missing in: ag/q/topic:merge_5945220

How was this generated:
$ git merge -s ours 40f875679387c0f6f908428d0142eacefeda0247

More context:
40f875679387c0f6f908428d0142eacefeda0247 is Launcher3 SHA from build 5945220

Test: on top of this git history CL, I executed merge and only two files
had merge conflicts BaseIconFactory and QuicksteLauncher.

Change-Id: Ifd9b738aa681202cff09ccfc18c2a2f8a08acbe3