Explorar o código

Merge branch 'android-6.0' of https://github.com/omnirom/android into omnirom-android-6.0

Conflicts:
	README.md
lj50036 %!s(int64=10) %!d(string=hai) anos
pai
achega
efc1410e6c

Os datos das diferenzas Diff non están dispoñibles.