diff options
author | lookshe <github@lookshe.org> | 2016-03-20 02:29:46 +0100 |
---|---|---|
committer | lookshe <github@lookshe.org> | 2016-03-20 02:29:46 +0100 |
commit | ad8e8344c0c051dd22adf76df624dd16cabcea28 (patch) | |
tree | a8e5818ef393087eb406df9d26bef3b36caa3f75 /src/main/res/values/encryption_settings.xml | |
parent | 6de11f38eaeb758692e0690f7150556d46d1f674 (diff) | |
parent | fb00372269ab0ed9ed0fbc1bd502695ffc17dd1b (diff) |
Merge branch 'trz/rebase' (early part) into trz/rename
Diffstat (limited to 'src/main/res/values/encryption_settings.xml')
0 files changed, 0 insertions, 0 deletions