summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* WifiInstaller: add permission for access downloaded filesandroid-7.1.1_r61android-7.1.1_r60android-7.1.1_r59nougat-mr1.8-releasenougat-mr1-security-releasePeter Qiu2017-01-301-0/+1
* WifiInstaller: remove the installation filePeter Qiu2017-01-201-0/+17
* Import translations. DO NOT MERGEandroid-cts-7.1_r3android-cts-7.1_r2android-cts-7.1_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r6android-7.1.1_r4android-7.1.1_r3android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1nougat-mr1.2-releaseBill Yi2016-08-191-1/+1
* Import translations. DO NOT MERGEandroid-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-dr1-releaseBill Yi2016-07-206-8/+8
* Skip non KeyEntry from PKCS12 file during extraction.Rubin Xu2016-06-161-7/+14
|\
| * Skip non KeyEntry from PKCS12 file during extraction.android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r1nougat-releasenougat-devnougat-cts-releaseRubin Xu2016-06-161-7/+14
* | Import translations. DO NOT MERGEBaligh Uddin2016-06-080-0/+0
|\|
| * Import translations. DO NOT MERGEBaligh Uddin2016-06-074-4/+4
* | Import translations. DO NOT MERGEBill Yi2016-06-030-0/+0
|\|
| * Import translations. DO NOT MERGEBill Yi2016-06-0311-15/+15
* | Import translations. DO NOT MERGEBill Yi2016-06-0320-40/+40
* | Import translations. DO NOT MERGEBaligh Uddin2016-05-220-0/+0
|\|
| * Import translations. DO NOT MERGEBaligh Uddin2016-05-2112-27/+27
* | Import translations. DO NOT MERGEBaligh Uddin2016-05-040-0/+0
|\|
| * Import translations. DO NOT MERGEBaligh Uddin2016-05-041-1/+1
* | Approve CA certs automatically in CertInstallerVictor Chang2016-04-225-17/+59
|\|
| * 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