diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-14 16:02:28 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-14 16:02:28 +0200 |
commit | 2f95100d88954db389cba8e615390795d121c1c8 (patch) | |
tree | 1bf4ffb29bb83fac33ba2ed7c84fb1d6a8af2bd4 /OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_disabled_holo_light.9.png | |
parent | 90ac60b6db0637fbefbce5cb2cd80a64f5bb708d (diff) | |
parent | 638554f2560b3c5fd36ca9b4ba205cb5a999b84b (diff) | |
download | open-keychain-2f95100d88954db389cba8e615390795d121c1c8.tar.gz open-keychain-2f95100d88954db389cba8e615390795d121c1c8.tar.bz2 open-keychain-2f95100d88954db389cba8e615390795d121c1c8.zip |
Merge remote-tracking branch 'origin/master' into wrapped-key-ring
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_disabled_holo_light.9.png')
-rw-r--r-- | OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_disabled_holo_light.9.png | bin | 0 -> 1116 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_disabled_holo_light.9.png Binary files differnew file mode 100644 index 000000000..4ffdd869e --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_disabled_holo_light.9.png |