summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Merge Android Pie into master"android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3master-cuttlefish-testing-releaseXin Li2018-08-0790-21/+478
|\
| * Merge Android Pie into masterXin Li2018-08-0690-21/+478
|/|
| * Import translations. DO NOT MERGEBill Yi2018-08-0481-18/+99
| * Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li2018-06-0810-3/+379
| |\
| | * [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-05-230-0/+0
| | |\
| | | * Import translations. DO NOT MERGEandroid-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devBill Yi2018-05-233-3/+3
| | * | [automerger skipped] Import translations. DO NOT MERGE skipped: 252e848718 sk...Bill Yi2018-05-190-0/+0
| | |\|
| | | * [automerger skipped] Import translations. DO NOT MERGE skipped: 252e848718 sk...Bill Yi2018-05-190-0/+0
| | | |\
| | | | * [automerger skipped] Import translations. DO NOT MERGE skipped: 252e848718 sk...Bill Yi2018-05-190-0/+0
| | | | |\
| | | | | * [automerger skipped] Import translations. DO NOT MERGE skipped: 252e848718 sk...Bill Yi2018-05-190-0/+0
| | | | | |\
| | | | | | * [automerger skipped] Import translations. DO NOT MERGE skipped: 252e848718 sk...Android Build Merger (Role)2018-05-190-0/+0
| | | | | | |\
| | | | | | | * [automerger skipped] Import translations. DO NOT MERGE skipped: 252e848718Android Build Merger (Role)2018-05-190-0/+0
| | | | | | | |\
| | | | | | | | * Import translations. DO NOT MERGEBill Yi2018-05-186-16/+16
| | * | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-05-060-0/+0
| | |\| | | | | |
| | | * | | | | | Import translations. DO NOT MERGEBill Yi2018-05-041-5/+5
| | * | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-04-290-0/+0
| | |\| | | | | |
| | | * | | | | | Import translations. DO NOT MERGEBill Yi2018-04-282-2/+2
| | * | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-04-210-0/+0
| | |\| | | | | |
| | | * | | | | | Import translations. DO NOT MERGEBill Yi2018-04-212-7/+7
| | * | | | | | | [automerger skipped] Import translations. DO NOT MERGE skipped: d58ec3bbdf sk...Bill Yi2018-04-160-0/+0
| | |\| | | | | |
| | | * | | | | | [automerger skipped] Import translations. DO NOT MERGE skipped: d58ec3bbdf sk...Bill Yi2018-04-160-0/+0
| | | |\| | | | |
| | | | * | | | | [automerger skipped] Import translations. DO NOT MERGE skipped: d58ec3bbdf sk...Bill Yi2018-04-160-0/+0
| | | | |\| | | |
| | | | | * | | | [automerger skipped] Import translations. DO NOT MERGE skipped: d58ec3bbdf sk...Bill Yi2018-04-160-0/+0
| | | | | |\| | |
| | | | | | * | | [automerger skipped] Import translations. DO NOT MERGE skipped: d58ec3bbdf sk...Android Build Merger (Role)2018-04-160-0/+0
| | | | | | |\| |
| | | | | | | * | [automerger skipped] Import translations. DO NOT MERGE skipped: d58ec3bbdfAndroid Build Merger (Role)2018-04-160-0/+0
| | | | | | | |\|
| | | | | | | | * Import translations. DO NOT MERGEBill Yi2018-04-161-1/+1
| | * | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-04-120-0/+0
| | |\| | | | | |
| | | * | | | | | Import translations. DO NOT MERGEBill Yi2018-04-121-1/+1
| | * | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi2018-04-020-0/+0
| | |\| | | | | |
| | | * | | | | | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2018-04-020-0/+0
| | | |\ \ \ \ \ \
| | | | * | | | | | Import translations. DO NOT MERGEBill Yi2018-04-0166-132/+84
| | * | | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-04-020-0/+0
| | |\| | | | | | |
| | | * | | | | | | Import translations. DO NOT MERGEBill Yi2018-03-3166-132/+84
| | | |/ / / / / /
| | * | | | | | | [automerger skipped]Import translations. DO NOT MERGEBill Yi2018-03-240-0/+0
| | |\| | | | | |
| | | * | | | | | Import translations. DO NOT MERGEBill Yi2018-03-2368-0/+115
| | * | | | | | | Inform the user about the implications of installing a CA certificateEran Messeri2018-03-213-0/+17
| | |\| | | | | |
| | | * | | | | | Inform the user about the implications of installing a CA certificateEran Messeri2018-03-213-0/+17
| | * | | | | | | Import translations. DO NOT MERGEBill Yi2018-03-060-0/+0
| | |\| | | | | |
| | | * | | | | | Import translations. DO NOT MERGEBill Yi2018-03-062-16/+8
| | |/ / / / / /
| | * | | | | | Merge "Limit cert file reading to 10MiB." am: ae1a16bd41 am: 3500e1ce00Adam Vartanian2018-02-271-3/+29
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge "Limit cert file reading to 10MiB." am: ae1a16bd41Adam Vartanian2018-02-271-3/+29
| | | |\ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge "Limit cert file reading to 10MiB."Adam Vartanian2018-02-271-3/+29
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge "Limit cert file reading to 10MiB."android-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7Adam Vartanian2018-02-271-3/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Limit cert file reading to 10MiB.Adam Vartanian2018-02-261-3/+29
|/ / / / / / / / /
| | * | | | | | | Import translations. DO NOT MERGEBill Yi2018-02-261-36/+18
| | * | | | | | | Merge "packages/apps/CertInstaller: Set LOCAL_SDK_VERSION where possible." am...hansson2018-02-221-0/+1
| | |\| | | | | |
| | | * | | | | | Merge "packages/apps/CertInstaller: Set LOCAL_SDK_VERSION where possible." am...hansson2018-02-221-0/+1
| | | |\ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge "packages/apps/CertInstaller: Set LOCAL_SDK_VERSION where possible."hansson2018-02-221-0/+1
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge "packages/apps/CertInstaller: Set LOCAL_SDK_VERSION where possible."hansson2018-02-221-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | packages/apps/CertInstaller: Set LOCAL_SDK_VERSION where possible.Anton Hansson2018-02-221-0/+1
|/ / / / / / / / /