82bf63fbdff18686ab28e3c510e3b2dda9046979
e1d69c9d: (-s ours) resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp
* commit 'e1d69c9d5aa3f359889fc73572a45cb89be2440a':
resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp
Languages
Java
55.6%
Kotlin
43.5%
JavaScript
0.3%
AIDL
0.2%
CSS
0.2%