summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importlineage-17.1Michael Bestas2020-04-237-6/+18
| | | | Change-Id: I913121f9aaa996be76199b54dad8681140f41310
* Automatic translation importMichael Bestas2020-01-276-0/+119
| | | | Change-Id: I4b90720c88950420d61409fe916e0c1d7b4270bc
* Merge stage-aosp-master into pi-dev-plus-aospstaging/lineage-17.0_merge-android-10.0.0_r9Xin Li2019-02-250-0/+0
|\ | | | | | | | | | | am: f4eb173c45 Change-Id: I4587a9ac221f012769aad1a2c712237c88ddc40d
| * Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\ | | | | | | | | | | | | Bug: 126125118 Change-Id: I31417836ae91480839043d1ecc639ca06cd6de4e
| | * DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
| | |\ | | | | | | | | | | | | | | | | Bug: 120848293 Change-Id: I8d5d64c6de4ecbf51e026b2b8faf44c11e519e52
* | | | [automerger skipped] Import translations. DO NOT MERGE am: 0a2ed801db -s oursBill Yi2019-02-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 61564d79ab -s ours am skip reason: subject contains skip directive Change-Id: Iac12de84eb9ca67cd947325a99be68aee17f45b6
| * | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-02-220-0/+0
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | am: 0a2ed801db -s ours am skip reason: subject contains skip directive Change-Id: I6dcca71e9fa541abd1a696ecd2877be252c15cb0
| | * | Import translations. DO NOT MERGEBill Yi2019-02-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I3666c7b6597c018e2484544a7d13ebcac58880a6
* | | | Import translations. DO NOT MERGEBill Yi2019-02-021-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Id37c8e4efcdf0fcfc1c782bc2e26144190c8d544 Auto-generated-cl: translation import
* | | | Merge "Convert Android.mk file to Android.bp" am: 7c18b9609f am: 10d953e9e6Sasha Smundak2019-01-092-18/+6
|\| | | | | | | | | | | | | | | | | | | | | | | am: 8bb1ebde1b Change-Id: I5ea5e49c013e525a25a69edb35d82f89ea40bb85
| * | | Merge "Convert Android.mk file to Android.bp" am: 7c18b9609fSasha Smundak2019-01-092-18/+6
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | am: 10d953e9e6 Change-Id: I150cf4741128ab06e672f02207618946aaebd7cd
| | * | Merge "Convert Android.mk file to Android.bp"Sasha Smundak2019-01-092-18/+6
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: 7c18b9609f Change-Id: I5c4e964b3e411631c2ce936e95e795b214499bf9
| | | * \ Merge "Convert Android.mk file to Android.bp"Treehugger Robot2019-01-092-18/+6
| | | |\ \
| | | | * | Convert Android.mk file to Android.bpSasha Smundak2019-01-082-18/+6
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See build/soong/README.md for more information. Bug: 122332995 Test: treehugger Change-Id: Ib5479bb741243e545ab847f3c54a3b8357899f3f
* | | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: aa20e8cc0f -s ours am: aff88e309d -s ours am: c7a88ddaa7 -s ours Change-Id: I5dc0029084858d8f5eb637bb17d4fb0298c897ac
| * | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: aa20e8cc0f -s ours am: aff88e309d -s ours Change-Id: I92b67586b32049463ae36db8d930c7d92234fe79
| | * | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: aa20e8cc0f -s ours Change-Id: Ibb3518bd0c5f03499e61326b33d321379a13e4a1
| | | * | Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | Change-Id: I776e76e978c793aab3eb1e6e7939dc36eb50ac03
* | | | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: e0fa47edc1 -s ours am: 075ac0cf96 -s ours Change-Id: Ia33e913b4f6e6fba7af97bb9095677aa94d0a811
| * | | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: e0fa47edc1 -s ours Change-Id: I91f1f8aea862279640d2853d7618c2ee5c4dd1ab
| | * | | | Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ / Change-Id: Icfe1d70d1559871edaf246213fa198f23803541c
| | | * | Snap for 4778776 from 365656b09772f78cc990086e3eebd904f18a4abd to pi-releaseandroid-build-team Robot2018-05-132-2/+2
| | | |\| | | | | | | | | | | | | | | | Change-Id: I0fbb8e96a1130099a227d96cc857a4fa92bcb24f
| | | * | Snap for 4620899 from 72ebbaa60875b0f95bab23ac2cd2f964f20b89bd to pi-releaseandroid-build-team Robot2018-02-253-0/+43
| | | |\ \ | | | | | | | | | | | | | | | | | | Change-Id: If6506c1ae4c94d894ecbcfee7c7bf2f35c9004f5
| | | * \ \ Snap for 4611397 from 5133d985daa4ca0354d2df4a1ca249c42b2cf78b to pi-releaseandroid-build-team Robot2018-02-190-0/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I4d829a6434e8d5f4bde54dc9b63f8b3dab90ebd5
| | | * \ \ \ Snap for 4605948 from c3441bcb11dc414911dd5681fd01ca1d2dde74d2 to pi-releaseandroid-build-team Robot2018-02-152-25/+19
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1aae93bc105838eebcfa34917742f52f8c4d24f9
| | | * \ \ \ \ Snap for 4585119 from 0adef8f9615dcd62bfbe1a611cdbb2b0d5aea8a9 to pi-releaseandroid-build-team Robot2018-02-051-1/+1
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic8f928a5e24cf21837829120d7ca7d9d06752cb3
| | | * \ \ \ \ \ Snap for 4571561 from 405bec6834ea3e09595f50618557aaaccd0e23d5 to pi-releaseandroid-build-team Robot2018-01-280-0/+0
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib6c92b5e9a4e63cf35717f161a8f25025d109c20
| | | * \ \ \ \ \ \ Snap for 4510491 from 593eb0a52527c772a8121fab98c0bbdff336e6ce to pi-releaseandroid-build-team Robot2017-12-201-1/+1
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I234bab9faa0294405866d723a6fd431c10a3df58
| | | * \ \ \ \ \ \ \ Snap for 4453288 from cb0778a70d68f9f6196bbd867326cbdc4519651a to pi-releaseandroid-build-team Robot2017-11-150-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I628f3208f2827faf1d2facbf14fa2672a9ebf516
| | | * \ \ \ \ \ \ \ \ Snap for 4410151 from 96975bdd42d9d92869720e00452524027064f236 to pi-releaseandroid-build-team Robot2017-10-210-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idad0a54e41a315b254bcc23b45c494f7fdaea90b
| | | * \ \ \ \ \ \ \ \ \ Snap for 4373608 from 5f9e0ffc24be429f60db5bdfd21e6898942603f1 to pi-releaseandroid-build-team Robot2017-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I98f3c335186e9c69a9194e407ea66c9fbd7599d6
| | | * \ \ \ \ \ \ \ \ \ \ release-request-b06579bd-a905-4db5-ada9-c69d40f4df90-for-git_pi-release-4335 ↵android-build-team Robot2017-09-141-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 309 snap-temp-L62700000102430107 Change-Id: I5b0371db3e13f5f42f2005b76109b222a352a0b7
| | | * \ \ \ \ \ \ \ \ \ \ \ release-request-38d4765e-6779-4912-a79f-25f77b8184a7-for-git_pi-release-4288 ↵android-build-team Robot2017-08-202-0/+42
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 638 snap-temp-L71800000095143664 Change-Id: I3f6c30565f9a4845a51e0caf8c42b0a534a4f3df
| | | * \ \ \ \ \ \ \ \ \ \ \ \ release-request-8c6f0e6c-413f-4241-b3dc-c159fdcc7655-for-git_pi-release-4273 ↵android-build-team Robot2017-08-1581-0/+1701
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 687 snap-temp-L51400000093075386 Change-Id: Ie949f53807466bc42d1a3a47765aa15306fc3b7d
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-631994b2-37c0-4d03-8caa-bfd01530db29-for-git_pi-release-4269 ↵android-build-team Robot2017-08-1381-1701/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 836 snap-temp-L23500000092503827 Change-Id: Iacd76a43cf479d9f4710fc5de4963f39382f3950
* | | | | | | | | | | | | | | | | | Merge "Merge Android Pie into master" am: d5672084ae am: f843e0f0fa am: ↵Xin Li2018-08-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 002567834d am: 8cd035d667 Change-Id: I61c11175c4bd0e4c18f57a9db3ecad0ed3f9b2da
| * | | | | | | | | | | | | | | | | Merge "Merge Android Pie into master" am: d5672084ae am: f843e0f0faXin Li2018-08-070-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 002567834d Change-Id: I8de2e6786e465a18650f2275b7a801fabdd2ad80
| | * | | | | | | | | | | | | | | | Merge "Merge Android Pie into master" am: d5672084aeXin Li2018-08-070-0/+0
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f843e0f0fa Change-Id: I753c63c7949896bca9e756a44f575b1c1618771a
| | * | | | | | | | | | | | | | | | Merge "Merge Android Pie into master"Xin Li2018-08-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d5672084ae Change-Id: I88a6a9c9df9954663607b489ae4219eeff21505f
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Merge Android Pie into master"Xin Li2018-08-078-27/+105
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | Merge Android Pie into masterXin Li2018-08-068-27/+105
| | | |/| | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112104996 Change-Id: I2ea5cd2c319b0da3dc58fa325e81468f9a6fe0f6
* | | | | | | | | | | | | | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 86eb4b9266Xin Li2018-06-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ce49b44781 Change-Id: I82f5d2ab37679f0264d2b0eb7838ff5474e7d1bb
| * | | | | | | | | | | | | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li2018-06-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 86eb4b9266 Change-Id: Icc7d0ce1fc6f761fe732ae3fc5d5bd96518f5ba1
| | * | | | | | | | | | | | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li2018-06-088-27/+105
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 79597307 Change-Id: I4a76da0091e9b63c1e8378eda89b532c4118bee4
* | | | | | | | | | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: 365656b097 -s oursBill Yi2018-05-120-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5c927bff32 -s ours Change-Id: I591149d8abf308ec0a7f406c42fc6af4be508753
| * | | | | | | | | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-05-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 365656b097 -s ours Change-Id: I6e9717ecc398c2503fddefc0ce4bcbc357151425
| | * | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-05-122-2/+2
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Icd3fce647bfb793d3ce65794e292ff82ff8cb73a
* | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-05-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I01f252580ddac88cbf736d09fd356e69631bfd85 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-04-201-1/+1
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id5e1c644c810512aa011bcd62725139de1110f18 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | Merge "packages/screensavers/Basic: Set LOCAL_SDK_VERSION where possible." ↵Anton Hansson2018-02-231-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6269ad665f am: eb7744a6da am: d5ae525b42 Change-Id: I1059fc2b2d8a9fd8247644099e825b5421da0d2b
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 14:25:55 +0000