diff options
| author | Sean Leonard <meanderingcode@aetherislands.net> | 2014-03-01 18:51:03 -0800 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2014-03-01 18:51:03 -0800 |
| commit | 2af6e92bdb4cc8773e43f17e459f0b70aece8dd8 (patch) | |
| tree | c2bd64d62f470ef9f2a39ba349a5978f957300ec /AndroidManifest.xml | |
| parent | c9eea0961c8c6082b5f996b6a949f6d63d12322a (diff) | |
| parent | ff19d1fd8845053d42765d77a04440b6d1eed01e (diff) | |
Merge branch 'feature/timezone-vpn-gateway-selection' into develop
Diffstat (limited to 'AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions