Daniel Lazar 2ce4050a54 Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-hostage-v3 9 gadi atpakaļ
..
activity 49e08e662c Fixed up navigation in the wifi direct activity 9 gadi atpakaļ
adapter 4fd0c4b1b0 fixed services indicator showing wrong icon bug 9 gadi atpakaļ
dialog cb543bc5ca merged conflicts 9 gadi atpakaļ
fragment 2ce4050a54 Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-hostage-v3 9 gadi atpakaļ
helper cb543bc5ca merged conflicts 9 gadi atpakaļ
layouts cb543bc5ca merged conflicts 9 gadi atpakaļ
model f80bf8764d fixed merge conflicts 9 gadi atpakaļ
popup cb543bc5ca merged conflicts 9 gadi atpakaļ
swipelist cb543bc5ca merged conflicts 9 gadi atpakaļ
task 66b19427a8 Merged rc - branch and small clean up 10 gadi atpakaļ