Alexander Brakowski a6c13f7300 merge wifidirect changes %!s(int64=9) %!d(string=hai) anos
..
opengl cb543bc5ca merged conflicts %!s(int64=9) %!d(string=hai) anos
AboutFragment.java cb543bc5ca merged conflicts %!s(int64=9) %!d(string=hai) anos
ConnectionInfoDialogFragment.java cb543bc5ca merged conflicts %!s(int64=9) %!d(string=hai) anos
HomeFragment.java f80bf8764d fixed merge conflicts %!s(int64=9) %!d(string=hai) anos
PreferenceHostageFrament.java cb543bc5ca merged conflicts %!s(int64=9) %!d(string=hai) anos
ProfileEditFragment.java f80bf8764d fixed merge conflicts %!s(int64=9) %!d(string=hai) anos
ProfileManagerFragment.java cb543bc5ca merged conflicts %!s(int64=9) %!d(string=hai) anos
RecordDetailFragment.java f80bf8764d fixed merge conflicts %!s(int64=9) %!d(string=hai) anos
RecordOverviewFragment.java a6c13f7300 merge wifidirect changes %!s(int64=9) %!d(string=hai) anos
ServicesFragment.java cb543bc5ca merged conflicts %!s(int64=9) %!d(string=hai) anos
SettingsFragment.java 66b19427a8 Merged rc - branch and small clean up %!s(int64=10) %!d(string=hai) anos
StatisticsFragment.java cb543bc5ca merged conflicts %!s(int64=9) %!d(string=hai) anos
ThreatMapFragment.java f80bf8764d fixed merge conflicts %!s(int64=9) %!d(string=hai) anos
TrackerFragment.java f80bf8764d fixed merge conflicts %!s(int64=9) %!d(string=hai) anos
UpNavigatibleFragment.java 66b19427a8 Merged rc - branch and small clean up %!s(int64=10) %!d(string=hai) anos