summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge stage-aosp-master into pi-dev-plus-aospandroid-mainline-10.0.0_r9android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li2019-02-250-0/+0
|\
| * Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\
| | * DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
| | |\
* | | | [automerger skipped] Import translations. DO NOT MERGE am: 0a2ed801db -s oursBill Yi2019-02-220-0/+0
|\| | |
| * | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-02-220-0/+0
| |\ \ \ | | |_|/ | |/| |
| | * | Import translations. DO NOT MERGEBill Yi2019-02-211-2/+2
* | | | Import translations. DO NOT MERGEBill Yi2019-02-021-2/+2
* | | | Merge "Convert Android.mk file to Android.bp" am: 7c18b9609f am: 10d953e9e6Sasha Smundak2019-01-092-18/+6
|\| | |
| * | | Merge "Convert Android.mk file to Android.bp" am: 7c18b9609fSasha Smundak2019-01-092-18/+6
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Convert Android.mk file to Android.bp"Sasha Smundak2019-01-092-18/+6
| | |\ \
| | | * \ Merge "Convert Android.mk file to Android.bp"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseTreehugger Robot2019-01-092-18/+6
| | | |\ \
| | | | * | Convert Android.mk file to Android.bpSasha Smundak2019-01-082-18/+6
| | | |/ /
* | | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE...Bill Yi2018-10-240-0/+0
|\| | | |
| * | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE...Bill Yi2018-10-240-0/+0
| |\| | |
| | * | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | |\| |
| | | * | Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-n-iot-release-ihome-igv1nougat-iot-releaseBill Yi2018-10-240-0/+0
| | | |\ \
* | | | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ...Bill Yi2018-10-240-0/+0
|\| | | | |
| * | | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ...Bill Yi2018-10-240-0/+0
| |\| | | |
| | * | | | Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * | Snap for 4778776 from 365656b09772f78cc990086e3eebd904f18a4abd to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r2android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-cts-releaseandroid-build-team Robot2018-05-132-2/+2
| | | |\|
| | | * | Snap for 4620899 from 72ebbaa60875b0f95bab23ac2cd2f964f20b89bd to pi-releaseandroid-build-team Robot2018-02-253-0/+43
| | | |\ \
| | | * \ \ Snap for 4611397 from 5133d985daa4ca0354d2df4a1ca249c42b2cf78b to pi-releaseandroid-build-team Robot2018-02-190-0/+0
| | | |\ \ \
| | | * \ \ \ Snap for 4605948 from c3441bcb11dc414911dd5681fd01ca1d2dde74d2 to pi-releaseandroid-build-team Robot2018-02-152-25/+19
| | | |\ \ \ \
| | | * \ \ \ \ Snap for 4585119 from 0adef8f9615dcd62bfbe1a611cdbb2b0d5aea8a9 to pi-releaseandroid-build-team Robot2018-02-051-1/+1
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Snap for 4571561 from 405bec6834ea3e09595f50618557aaaccd0e23d5 to pi-releaseandroid-build-team Robot2018-01-280-0/+0
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Snap for 4510491 from 593eb0a52527c772a8121fab98c0bbdff336e6ce to pi-releaseandroid-build-team Robot2017-12-201-1/+1
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Snap for 4453288 from cb0778a70d68f9f6196bbd867326cbdc4519651a to pi-releaseandroid-build-team Robot2017-11-150-0/+0
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Snap for 4410151 from 96975bdd42d9d92869720e00452524027064f236 to pi-releaseandroid-build-team Robot2017-10-210-0/+0
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Snap for 4373608 from 5f9e0ffc24be429f60db5bdfd21e6898942603f1 to pi-releaseandroid-build-team Robot2017-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ release-request-b06579bd-a905-4db5-ada9-c69d40f4df90-for-git_pi-release-43353...android-build-team Robot2017-09-141-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ release-request-38d4765e-6779-4912-a79f-25f77b8184a7-for-git_pi-release-42886...android-build-team Robot2017-08-202-0/+42
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ release-request-8c6f0e6c-413f-4241-b3dc-c159fdcc7655-for-git_pi-release-42736...android-build-team Robot2017-08-1581-0/+1701
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-631994b2-37c0-4d03-8caa-bfd01530db29-for-git_pi-release-42698...android-build-team Robot2017-08-1381-1701/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | Merge "Merge Android Pie into master" am: d5672084ae am: f843e0f0fa am: 00256...Xin Li2018-08-080-0/+0
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "Merge Android Pie into master" am: d5672084ae am: f843e0f0faXin Li2018-08-070-0/+0
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Merge Android Pie into master" am: d5672084aeXin Li2018-08-070-0/+0
| |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Merge Android Pie into master"Xin Li2018-08-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Merge Android Pie into master"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseXin Li2018-08-078-27/+105
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | Merge Android Pie into masterXin Li2018-08-068-27/+105
| | | |/| | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 86eb4b9266Xin Li2018-06-090-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li2018-06-090-0/+0
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li2018-06-088-27/+105
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: 365656b097 -s oursBill Yi2018-05-120-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-05-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Import translations. DO NOT MERGEandroid-9.0.0_r39android-9.0.0_r38android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-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-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devBill Yi2018-05-122-2/+2
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-05-011-1/+1
* | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-04-201-1/+1
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge "packages/screensavers/Basic: Set LOCAL_SDK_VERSION where possible." am...Anton Hansson2018-02-231-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Merge "packages/screensavers/Basic: Set LOCAL_SDK_VERSION where possible." am...Anton Hansson2018-02-231-0/+1
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "packages/screensavers/Basic: Set LOCAL_SDK_VERSION where possible."Anton Hansson2018-02-231-0/+1
| | |\| | | | | | | | | | | | | |