338e4ea7df1b3dd84525566820196910bb8ebe5a
057059665e to ub-launcher3-master
Test: I solemnly swear I tested this conflict resolution. Bug: None Change-Id: I8a92d1389acbefc5bf33ef9760373bfbf54d682b
Languages
Java
55.6%
Kotlin
43.5%
JavaScript
0.3%
AIDL
0.2%
CSS
0.2%