Vincent Breitmoser 54bc874ce5 Merge remote-tracking branch 'origin/master' into external-test ... Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java		2014-07-11 21:00:26 +02:00
..
drawable
drawable-hdpi
drawable-ldpi
drawable-mdpi
drawable-xhdpi
drawable-xxhdpi
drawable-xxxhdpi
layout	cleanup	2014-07-08 03:37:32 +02:00
layout-large
menu
raw
raw-ar
raw-cs
raw-de	Pull from transifex	2014-07-03 16:38:22 +02:00
raw-el
raw-es
raw-et
raw-fr
raw-it
raw-ja
raw-ko
raw-nl
raw-pl
raw-ru
raw-sk	Pull from transifex	2014-07-03 16:30:41 +02:00
raw-sl
raw-tr
raw-uk
raw-zh
values	Merge remote-tracking branch 'origin/master' into external-test	2014-07-11 21:00:26 +02:00
values-ar	Pull from transifex	2014-07-03 16:30:41 +02:00
values-cs	Pull from transifex	2014-07-03 16:30:41 +02:00
values-de	Pull from transifex	2014-07-03 16:38:22 +02:00
values-el	Pull from transifex	2014-07-03 16:30:41 +02:00
values-es	Pull from transifex	2014-07-03 16:38:22 +02:00
values-et	Pull from transifex	2014-07-03 16:30:41 +02:00
values-fr	Pull from transifex	2014-07-03 16:30:41 +02:00
values-it	Pull from transifex	2014-07-03 16:30:41 +02:00
values-ja	Pull from transifex	2014-07-03 16:30:41 +02:00
values-ko	Pull from transifex	2014-07-03 16:30:41 +02:00
values-large
values-nl	Pull from transifex	2014-07-03 16:30:41 +02:00
values-pl	Pull from transifex	2014-07-03 16:30:41 +02:00
values-ru	Pull from transifex	2014-07-03 16:30:41 +02:00
values-sk	Pull from transifex	2014-07-03 16:30:41 +02:00
values-sl	Pull from transifex	2014-07-03 16:30:41 +02:00
values-tr	Pull from transifex	2014-07-03 16:30:41 +02:00
values-uk	Pull from transifex	2014-07-03 16:30:41 +02:00
values-v11
values-zh	Pull from transifex	2014-07-03 16:30:41 +02:00
xml