Alexander Brakowski a6c13f7300 merge wifidirect changes 9 lat temu
..
opengl cb543bc5ca merged conflicts 9 lat temu
AboutFragment.java cb543bc5ca merged conflicts 9 lat temu
ConnectionInfoDialogFragment.java cb543bc5ca merged conflicts 9 lat temu
HomeFragment.java f80bf8764d fixed merge conflicts 9 lat temu
PreferenceHostageFrament.java cb543bc5ca merged conflicts 9 lat temu
ProfileEditFragment.java f80bf8764d fixed merge conflicts 9 lat temu
ProfileManagerFragment.java cb543bc5ca merged conflicts 9 lat temu
RecordDetailFragment.java f80bf8764d fixed merge conflicts 9 lat temu
RecordOverviewFragment.java a6c13f7300 merge wifidirect changes 9 lat temu
ServicesFragment.java cb543bc5ca merged conflicts 9 lat temu
SettingsFragment.java 66b19427a8 Merged rc - branch and small clean up 10 lat temu
StatisticsFragment.java cb543bc5ca merged conflicts 9 lat temu
ThreatMapFragment.java f80bf8764d fixed merge conflicts 9 lat temu
TrackerFragment.java f80bf8764d fixed merge conflicts 9 lat temu
UpNavigatibleFragment.java 66b19427a8 Merged rc - branch and small clean up 10 lat temu