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