summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Skip non KeyEntry from PKCS12 file during extraction.staging/cm-14.0cm-14.0Rubin Xu2016-06-161-7/+14
* Import translations. DO NOT MERGEBaligh Uddin2016-06-074-4/+4
* Import translations. DO NOT MERGEBill Yi2016-06-0311-15/+15
* Import translations. DO NOT MERGEBaligh Uddin2016-05-2112-27/+27
* Import translations. DO NOT MERGEBaligh Uddin2016-05-041-1/+1
* Approve CA certs automatically in CertInstallerVictor Chang2016-04-145-17/+59
* When installing client cert, do not add CA certs to trusted credentialsRubin Xu2016-03-292-6/+28
* Add back DocumentsContract.EXTRA_SHOW_ADVANCED flag, because it wasAga Wronska2016-03-221-0/+1
* Import translations. DO NOT MERGEGeoff Mendal2016-03-191-0/+77
* Fix build break from removal of DocumentsContract.EXTRA_SHOW_ADVANCEDGeorge Mount2016-03-021-1/+0
* Import translations. DO NOT MERGEGeoff Mendal2016-02-293-10/+87
* Merge "Remove unused string: storage_error" into nyc-devRobin Lee2016-02-2580-80/+0
|\
| * Remove unused string: storage_errorRobin Lee2016-02-2380-80/+0
* | resolve merge conflicts of ef177fb06e to cw-e-dev am: 7e2d30d880Robin Lee2016-02-230-0/+0
|\ \ | |/ |/|
| * resolve merge conflicts of ef177fb06e to cw-e-devRobin Lee2016-02-232-1/+9
| |\
| | * resolve merge conflicts of ef177fb06e to cw-e-devRobin Lee2016-02-232-1/+9
| | |\
| | | * Trust CA certificates added for the whole OS only am: 4f135c9bd7 am: 63176f41...Robin Lee2016-02-232-1/+8
| | | |\
| | | | * Trust CA certificates added for the whole OS only am: 4f135c9bd7 am: 63176f41...Robin Lee2016-02-232-1/+8
| | | | |\
| | | | | * Trust CA certificates added for the whole OS only am: 4f135c9bd7 am: 63176f41...Robin Lee2016-02-232-1/+8
| | | | | |\
| | | | | | * Trust CA certificates added for the whole OS only am: 4f135c9bd7 am: 63176f41...Robin Lee2016-02-232-1/+8
| | | | | | |\
| | | | | | | * Trust CA certificates added for the whole OS only am: 4f135c9bd7 am: 63176f41...Robin Lee2016-02-232-1/+8
| | | | | | | |\
| | | | | | | | * Trust CA certificates added for the whole OS only am: 4f135c9bd7 am: 63176f41...Robin Lee2016-02-232-1/+8
| | | | | | | | |\
| | | | | | | | | * Trust CA certificates added for the whole OS only am: 4f135c9bd7 am: 63176f4144Robin Lee2016-02-232-1/+8
| | | | | | | | | |\
| | | | | | | | | | * Trust CA certificates added for the whole OS only am: 4f135c9bd7Robin Lee2016-02-232-1/+8
| | | | | | | | | | |\
| | | | | | | | | | | * Trust CA certificates added for the whole OS onlyRobin Lee2016-02-232-1/+8
| | | | | | | | | | | |\
| | | | | | | | | | | | * Trust CA certificates added for the whole OS onlyRobin Lee2016-02-222-1/+8
* | | | | | | | | | | | | Merge "Skip password dialog if PKCS#12 has no password" into nyc-devRobin Lee2016-02-222-8/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Skip password dialog if PKCS#12 has no passwordRobin Lee2016-02-122-8/+28
* | | | | | | | | | | | | | Trust CA certificates added for the whole OS onlyRobin Lee2016-02-222-1/+8
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2016-02-031-1/+1
* | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 3e4266b322 -s...Geoff Mendal2016-02-030-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into mnc-dr2-devGeoff Mendal2016-02-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into mnc-dr2-devGeoff Mendal2016-02-0378-95/+938
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2016-02-0378-95/+938
* | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 5bc3dabe05 -s ours am: 0bfd90d509 -s ...Geoff Mendal2016-02-030-0/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 5bc3dabe05 -s oursGeoff Mendal2016-02-030-0/+0
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2016-02-020-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| / / / / / / / / / / / / | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2016-02-0278-95/+938
* | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2016-01-181-9/+9
* | | | | | | | | | | | | | | Drop checks for locked WiFi key store when installing keys/certs.Jan Nordqvist2016-01-121-10/+0
* | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-12-211-2/+2
* | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 2c5449ee83 -s ours am: f209c8c7f9 -s ...Geoff Mendal2015-12-160-0/+0
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 2c5449ee83 -s ours am: f209c8c7f9 -s ...Geoff Mendal2015-12-160-0/+0
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Import translations. DO NOT MERGE am: 2c5449ee83 -s oursGeoff Mendal2015-12-160-0/+0
| | |\| | | | | | | | | | | |
| | | * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-12-160-0/+0
| | |/| | | | | | | | | | | | | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-12-154-8/+8
* | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-12-161-0/+78
* | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-11-303-3/+3
* | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-11-091-5/+5
* | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 5d360f869a -s oursBaligh Uddin2015-11-050-0/+0
|\| | | | | | | | | | | | |