aboutsummaryrefslogtreecommitdiffstats
path: root/Graphics/drawables/originals/ic_action_nfc/NFC.png
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-01-26 16:30:21 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-01-26 16:30:21 +0100
commit34a7728cec5c17ef25f3d5cd56421e4f5258862d (patch)
treef8fcf0aced9b106facff2e50405a19288931da6b /Graphics/drawables/originals/ic_action_nfc/NFC.png
parentb73ad7d87e7ddef03c17b4983f526c0613403df6 (diff)
parente049895b9f8f5f9996ac678acf6810768e859695 (diff)
downloadopen-keychain-34a7728cec5c17ef25f3d5cd56421e4f5258862d.tar.gz
open-keychain-34a7728cec5c17ef25f3d5cd56421e4f5258862d.tar.bz2
open-keychain-34a7728cec5c17ef25f3d5cd56421e4f5258862d.zip
Merge branch 'development' into detached-sigs-api
Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
Diffstat (limited to 'Graphics/drawables/originals/ic_action_nfc/NFC.png')
-rw-r--r--Graphics/drawables/originals/ic_action_nfc/NFC.pngbin0 -> 88038 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/Graphics/drawables/originals/ic_action_nfc/NFC.png b/Graphics/drawables/originals/ic_action_nfc/NFC.png
new file mode 100644
index 000000000..96af64049
--- /dev/null
+++ b/Graphics/drawables/originals/ic_action_nfc/NFC.png
Binary files differ