Alexander Brakowski a6c13f7300 merge wifidirect changes 9 gadi atpakaļ
..
activity f80bf8764d fixed merge conflicts 9 gadi atpakaļ
adapter f80bf8764d fixed merge conflicts 9 gadi atpakaļ
dialog cb543bc5ca merged conflicts 9 gadi atpakaļ
fragment a6c13f7300 merge wifidirect changes 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ļ