Tony Wickham 521224131e resolve merge conflicts of 5c229885fc to ub-launcher3-qt-future-dev
Bug: None
Test: I solemnly swear I tested this conflict resolution.

Change-Id: I41247ff46308b72158731e4a47466533d42e67c6
2019-09-20 16:22:59 -07:00
2019-09-18 10:53:13 -07: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%