Sunny Goyal b7484f9381 resolve merge conflicts of 9d9dbcb1b to ub-launcher3-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9978124fb3c24bb497cac0d199c0b5dcdc670715
2017-05-25 10:05:45 -07:00
S
Description
No description provided
658 MiB
Languages
Java 57.2%
Kotlin 42.4%
AIDL 0.3%