c318b48064383cf74a657a4f1cd8aae61633690e
2e52c90b: resolved conflicts for merge of 68fdeaad to ub-launcher3-burnaby
* commit '2e52c90b3ff0a04bd734aa19c54c39cef186b653':
resolved conflicts for merge of 68fdeaad to ub-launcher3-burnaby
am
10451a96: Merge "Adding BaseActivity which can be overriden for custom behavior" into ub-launcher3-burnaby
Languages
Java
55.6%
Kotlin
43.5%
JavaScript
0.3%
AIDL
0.2%
CSS
0.2%