2feac00e2b9cf46269ffa11bb71ba412e9c3d1b1
cf895ccc2 to ub-launcher3-master
Test: I solemnly swear I tested this conflict resolution. Change-Id: I9f60c248455d2c672fb70524111c169803312c48
Languages
Java
56.1%
Kotlin
43%
AIDL
0.3%
JavaScript
0.2%
CSS
0.2%