623daea93b8ca55b9cc99516df2284bde4322a0c
6f725f283 to ub-launcher3-master
Test: I solemnly swear I tested this conflict resolution. Change-Id: I3559969b62a9a4b1ec04697109636e8cb0fd9fc8
Languages
Java
56.1%
Kotlin
43%
AIDL
0.3%
JavaScript
0.2%
CSS
0.2%