summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Allow empty passwords when installing from a PKCS#12 fileandroid-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1tools_r21jb-releasejb-mr0-releasejb-devBrian Carlstrom2012-04-151-9/+3
* Import translations. DO NOT MERGEEric Fischer2012-04-131-1/+1
* Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood2012-04-030-0/+0
|\
| * am 8292ec01: Import translations. DO NOT MERGEEric Fischer2012-02-102-4/+7
| |\
| * \ am 72a70411: Import revised translations. DO NOT MERGEEric Fischer2011-11-211-2/+2
| |\ \
| * \ \ am a70922ff: Import revised translations. DO NOT MERGEEric Fischer2011-11-161-1/+1
| |\ \ \
| * \ \ \ am 2546ac02: am 86b2f598: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-090-0/+0
| |\ \ \ \
| * \ \ \ \ am 8d57f6e9: Import revised translations.Eric Fischer2011-11-012-0/+100
| |\ \ \ \ \
| * \ \ \ \ \ keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-260-0/+0
| | |\ \ \ \ \ \
| | | * | | | | | reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| | |/| | | | | | | |/|/ / / / / /
| | * | | | | | am fe3f2097: Import revised translations.Eric Fischer2011-10-251-1/+1
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ am 38b668b4: (-s ours) am 2d389665: (-s ours) Import revised translations. D...Eric Fischer2011-10-210-0/+0
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ am 3c9afcbb: Merge "Import revised translations."Eric Fischer2011-10-182-1/+51
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am 8640562b: (-s ours) am 014fe2d5: (-s ours) Import revised translations. D...Eric Fischer2011-10-180-0/+0
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ am 2b4e09fc: Import revised translations.Eric Fischer2011-10-101-1/+1
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ am dc51b08b: Import revised translations.Eric Fischer2011-09-3041-41/+41
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ am 15451904: (-s ours) am bf7fadf9: (-s ours) Import revised translations. D...Eric Fischer2011-09-280-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ am f4297575: (-s ours) am 6cfb69a5: (-s ours) Import revised translations. D...Eric Fischer2011-09-230-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am b7bf7cde: (-s ours) am 3f529315: (-s ours) Import revised translations. D...Eric Fischer2011-09-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f41cf0a2: Import revised translations.Eric Fischer2011-09-2046-46/+46
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8c36b376: (-s ours) am 40320d2b: (-s ours) Import revised translations. D...Eric Fischer2011-09-160-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | Broader support for KeyChain.EXTRA_NAMEBrian Carlstrom2012-03-303-13/+25
* | | | | | | | | | | | | | | | | | | Convert to new KeyStore formatKenny Root2012-03-191-8/+14
* | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-03-071-4/+4
* | | | | | | | | | | | | | | | | | | am 9d9df27c: am 4fad005f: am 5e794499: Merge "Remove PKCS12_PASSWORD_DIALOG a...Jean-Baptiste Queru2012-02-132-2/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4fad005f: am 5e794499: Merge "Remove PKCS12_PASSWORD_DIALOG and NAME_CREDE...Jean-Baptiste Queru2012-02-132-2/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5e794499: Merge "Remove PKCS12_PASSWORD_DIALOG and NAME_CREDENTIAL_DIALOG ...android-sdk-adt_r20tools_r20ics-plus-aospJean-Baptiste Queru2012-02-132-2/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "Remove PKCS12_PASSWORD_DIALOG and NAME_CREDENTIAL_DIALOG in order to c...Jean-Baptiste Queru2012-02-132-2/+21
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Remove PKCS12_PASSWORD_DIALOG and NAME_CREDENTIAL_DIALOG in order to correctl...Shuhrat Dehkanov2012-02-082-2/+21
| | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | am d9195b1a: (-s ours) am 8292ec01: (-s ours) Import translations. DO NOT MERGEEric Fischer2012-02-100-0/+0
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am 8292ec01: (-s ours) Import translations. DO NOT MERGEEric Fischer2012-02-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEandroid-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1ics-mr1-releaseics-mr1Eric Fischer2012-02-082-4/+7
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-01-263-42/+58
* | | | | | | | | | | | | | | | | | Import revised translations.Eric Fischer2011-12-293-7/+7
* | | | | | | | | | | | | | | | | | am 72a70411: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-210-0/+0
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Import revised translations. DO NOT MERGEandroid-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.0.3_r1.1android-4.0.3_r1Eric Fischer2011-11-211-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | am a70922ff: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-170-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-161-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Import revised translations."Eric Fischer2011-11-1047-612/+612
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Import revised translations.Eric Fischer2011-11-1047-612/+612
* | | | | | | | | | | | | | | | | am 2546ac02: (-s ours) am 86b2f598: (-s ours) Import revised translations. D...Eric Fischer2011-11-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am 86b2f598: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Import revised translations. DO NOT MERGEandroid-sdk-adt_r16.0.1android-cts-4.0_r1android-4.0.2_r1ics-mr0-releaseics-mr0Eric Fischer2011-11-081-1/+1
* | | | | | | | | | | | | | | | String edits to use standard UI text terminologyClaudia de Veaux2011-11-021-13/+13
* | | | | | | | | | | | | | | | Merge "Import revised translations."Eric Fischer2011-11-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Import revised translations.Eric Fischer2011-11-022-0/+100
* | | | | | | | | | | | | | | | | am 8d57f6e9: Import revised translations.Eric Fischer2011-11-022-0/+100
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / /
| * | / / / / / / / / / / / / / Import revised translations.Eric Fischer2011-11-012-0/+100
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | am cb55e906: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-260-0/+0
|\| | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |