420115e7f1ccb881502ce126d74583eba8b2bb8d
Resolved merge conflict of ag/7093095 incorrectly and accidentally kept both HEAD and CL changes. Resolved in this CL. Test: Manual test Change-Id: Iad42ab12b486201f496c83f99c8c6094273543f3
Languages
Java
55.6%
Kotlin
43.5%
JavaScript
0.3%
AIDL
0.2%
CSS
0.2%