diff options
| author | Christian S <christian@pix-art.de> | 2016-01-15 18:19:00 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-01-15 18:19:00 +0100 |
| commit | 188e0a118cd0d9d0e009f4b0b062165f60f1a3da (patch) | |
| tree | 20ff0057054200eda1d7ce746a3b634fb873a576 /src/main/res/layout/activity_trust_keys.xml | |
| parent | 35a991844ad0275984bd21f82eae8056e406d923 (diff) | |
| parent | 635210d278ed3abc61e86978446c1f2f3706f2e4 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/layout/activity_trust_keys.xml')
0 files changed, 0 insertions, 0 deletions