Merge commit '40f875679387c0f6f908428d0142eacefeda0247'

Browse Source

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

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

More context:
40f8756793 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

...

This commit is contained in:

Hyunyoung Song

2019-11-19 14:23:57 -08:00

parent c5027ce20d 40f8756793

commit a45552c090

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available