vadimt 1ac98548a7 resolve merge conflicts of 08776ada1e to ub-launcher3-qt-future-dev
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9a3b0f67ee874b5ec4ad67f41a46ec7876d19082
Merged-in: I9a3b0f67ee874b5ec4ad67f41a46ec7876d19082
2019-10-03 20:58:15 +00:00
2019-08-08 02:02:20 -07:00
2019-05-17 23:19:58 -07:00
2019-08-28 16:32:59 -07:00
2018-11-02 14:18:45 -07:00
S
Description
No description provided
658 MiB
Languages
Java 57.2%
Kotlin 42.4%
AIDL 0.3%