Alexander Brakowski 49e08e662c Fixed up navigation in the wifi direct activity %!s(int64=9) %!d(string=hai) anos
..
MainActivity.java 49e08e662c Fixed up navigation in the wifi direct activity %!s(int64=9) %!d(string=hai) anos
ProfileEditActivity.java cb543bc5ca merged conflicts %!s(int64=9) %!d(string=hai) anos