Jon Miranda fcaff64c93 Resolve merge conflicts of 8eb0de133 to ub-launcher3-master ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I1e888f6941435befe6f1819de74dea985909ddf0

2017-03-28 12:14:13 -07:00

..

launcher_dump.proto

Launcher dump proto that will be used for:

2017-03-01 17:21:19 -08:00

launcher_log.proto

Add isInMultiWindowMode bool to all logs.

2017-03-22 13:08:50 -07:00