Files
packages_apps_Settings/AndroidManifest.xml
Tobias Thierer 5ce67493c3 resolve merge conflicts of 999f6a9a29 to master
Test: make

Change-Id: If37a66bc38d0fd02ef7465e9be86032c2aff6314
2017-04-26 12:21:23 +01:00

166 KiB