d598ec32d207d416eaba31635e3f1fa8284764cf
147d1e85: am 0c0d5463: resolved conflicts for merge of 13ef17a3 to mnc-ub-dev b/22609402
* commit '147d1e85d3f62fbaa04c0250ab4318660f020aca':
Languages
Java
55.6%
Kotlin
43.5%
JavaScript
0.3%
AIDL
0.2%
CSS
0.2%