summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-07-07[automerger skipped] Import translations. DO NOT MERGE am: 3e74be5e0a -s ↵android-11.0.0_r16android11-d1-b-releaseBill Yi
ours am: f598f5bff0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/12087997 Change-Id: Icbcb57fb1fdc94430918a68ba727d1155a549400
2020-07-07[automerger skipped] Import translations. DO NOT MERGE am: 3e74be5e0a -s oursandroid11-devBill Yi
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/12087997 Change-Id: Ibad2a281d555b3a3604fadcf532374f5b500151e
2020-07-06Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Change-Id: Iefcdab7486b1b37420d6c0fd552c74820f3cd282
2020-06-12DO NOT MERGE: Remove usage of deprecated toolbar method am: 5b07711b88Cole Faust
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/11853132 Change-Id: Ib26a27f44b2681af630361a8a68a455facd7dc3f
2020-06-12DO NOT MERGE: Remove usage of deprecated toolbar methodCole Faust
Bug: 158867330 Test: Presubmits Change-Id: Ia568f91454275ad7ff9cff50df8e068a13ffda26
2020-04-29Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Change-Id: I7c88a1799df7e4a1afa36de7769f6903a22f5dbf
2020-04-26Import translations. DO NOT MERGEBill Yi
Change-Id: I7007145000274c325509ed129471734106acfcc3 Auto-generated-cl: translation import
2020-04-23[automerger skipped] Import translations. DO NOT MERGE am: d8cf5af8ed -s oursBill Yi
am skip reason: subject contains skip directive Change-Id: Ibd510bb9663d741e0c9a347599ad2c57a7869851
2020-04-23Import translations. DO NOT MERGEBill Yi
Change-Id: I26511cb872ab7b1dd59c16b1e4c402335fe20018 Auto-generated-cl: translation import
2020-04-22Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Change-Id: I696c9cbf1e3d6c11d3a52485c896079196a7af1e
2020-04-19[automerger skipped] Import translations. DO NOT MERGE am: 0add27654d -s oursBill Yi
am skip reason: subject contains skip directive Change-Id: Ia8f1640e50776f23e6edb43e3cdae034c1a0b46c
2020-04-18Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Change-Id: I3f6bb9c97092e251cf79b4602dcb1d29f6ff59ae
2020-04-18[automerger skipped] Import translations. DO NOT MERGE am: 382c812450 -s ↵Bill Yi
ours am: 76d780a834 -s ours am skip reason: subject contains skip directive Change-Id: I57c4b1574cfe104084ec7939b30cb935e45d9a21
2020-04-18[automerger skipped] Import translations. DO NOT MERGE am: 382c812450 -s oursBill Yi
am skip reason: subject contains skip directive Change-Id: I7842219fb0cfc49b22fb97e4d987a76cbad99681
2020-04-14Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Change-Id: Ia8bb9d7c20556d33b2a8aed89d5a43c1400161f7
2020-04-13Update strings and char limits for SystemUpdater. am: 5620379e6cNicholas Sauer
Change-Id: I384297e635aadb3ae094b4ba12f9b65f48b871b4
2020-04-13Update strings and char limits for SystemUpdater.Nicholas Sauer
bug: 151082808 bug: 151081336 bug: 151082158 bug: 151081785 bug: 151016554 Test: make Change-Id: Ie7ea08a4ca64354c04a712a6123d23c50fd38f59
2020-04-07[automerger skipped] Import translations. DO NOT MERGE am: 4862d12365 -s oursBill Yi
am skip reason: subject contains skip directive Change-Id: I62ae71deb084ec6514fb96387cdfbd810d3b386e
2020-04-06Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Change-Id: I71bdcd6f7a5d607f24ac78027dc9e2934e413017
2020-03-30[automerger skipped] Import translations. DO NOT MERGE am: e90ed5ab4a -s oursBill Yi
am skip reason: subject contains skip directive Change-Id: Ic0a644590e2e0ec3e8142befa491ece3feed6d42
2020-03-30Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Change-Id: Ibdf38ba7cd1876636921876435ced7370901ac85
2020-03-27Merge "Remove dependancy on androidx car" into rvc-dev am: df7b969d3bRam Parameswaran
Change-Id: I7667e3acc0d14fbe700dded36f2bfa493fe451c0
2020-03-27Merge "Remove dependancy on androidx car" into rvc-devRam Parameswaran
2020-03-26Remove dependancy on androidx carRam Parameswaran
Fixes: 152452648 Fixes: 151232580 Test: Manual Change-Id: I536f494b387236812e08bc9dc3946f6591cab0a9
2020-03-25[automerger skipped] Import translations. DO NOT MERGE am: ce3d47683f -s oursBill Yi
am skip reason: subject contains skip directive Change-Id: I070e51f51e1c0bec14d906354296f55f96998c9b
2020-03-25Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Change-Id: Iab7799a69869fb7344f9aaa076315c1db81565a4
2020-01-27Request MANAGE_EXTERNAL_STORAGE permissionZim
With the deprecation of WRITE_MEDIA_STORAGE in R. Apps should migrate to requesting MANAGE_EXTERNAL_STORAGE permission Test: m Bug: 144914977 Change-Id: I86495f0d7b0e92da1ad8d8d155a7f7cb4f7b1690
2019-10-30[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 43729fbb2c am: ad64abe7c7 -s ours am skip reason: subject contains skip directive Change-Id: Ibf2217aad60025a046aff4b012aac4949dab181f
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2android-r-beta-3android-r-beta-2Xin Li
stage-aosp-master am: 43729fbb2c Change-Id: Iecd68d8bc53adb38bc1bc54f8abbcd557c67528e
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I1f0e6384efc0083a597b043199315a8fb348d284
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 98097fcd33 -s ours am: a9b08390e9 -s ours am: 18ee0215a6 -s ours am skip reason: change_id I93262c0d8a623323eeec809cd25d60406b50e8df with SHA1 b03cd5de10 is in history Change-Id: I590ea73f379af0f67f0454a94429d21215770794
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 98097fcd33 -s ours am: a9b08390e9 -s ours am skip reason: change_id I93262c0d8a623323eeec809cd25d60406b50e8df with SHA1 b03cd5de10 is in history Change-Id: I5ee78fdd2c6808fe2f17ed5d9fe4877fc7cd4460
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 98097fcd33 -s ours am skip reason: change_id I93262c0d8a623323eeec809cd25d60406b50e8df with SHA1 b03cd5de10 is in history Change-Id: I7b6db61c808420155eba7713cc430d9cc85f2131
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: Iaa3e9b852b9547c04d16043afd647871000341e4 Merged-In: I93262c0d8a623323eeec809cd25d60406b50e8df
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
b03cd5de10 -s ours am: bd64ebd8e9 am: 0828ab612c am: 9449852ea9 -s ours am skip reason: subject contains skip directive Change-Id: I5984c8c2b354cda810e72bc121561b8af9fa3418
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
b03cd5de10 -s ours am: bd64ebd8e9 am: 0828ab612c Change-Id: Ieee2dda54a21646c304bd2421e72614f15cac9e3
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
b03cd5de10 -s ours am: bd64ebd8e9 Change-Id: I74a6e8db5e46e2d7a5222f33ab7afed5f5de8bad
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into masterXin Li
am: b03cd5de10 -s ours am skip reason: subject contains skip directive Change-Id: I7462ea57cff06f0b762441d265dc3a3c9038376f
2019-09-04DO NOT MERGE - Merge Android 10 into masterndk-sysroot-r21Xin Li
Bug: 139893257 Change-Id: I93262c0d8a623323eeec809cd25d60406b50e8df
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: f015a74ae8 am: ea1ed806fa -s ours am skip reason: subject contains skip directive Change-Id: Ibe52a07116840c22c58a18c490c5ae56ea80a27e
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: f015a74ae8 Change-Id: I677506dd0adff89d1d304c26b6cc36e4b67eec73
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵temp_140451723Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I08c02eb1f9597619c5626e74c2d59322516f7498
2019-04-09SystemUpdater: allow to access removable storage am: ce01a11e58 am: 208c450391Xihua Chen
am: 0db4c41516 Change-Id: If895a0325756215cede78da5a8bd74de3d1e2d9e
2019-04-09SystemUpdater: allow to access removable storage am: ce01a11e58Xihua Chen
am: 208c450391 Change-Id: I7526842aba7fa06c7bac3c4292236934421200c9
2019-04-09[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into ↵Xin Li
stage-aosp-master am: f1e36cfc25 -s ours am: 9c123de45f -s ours am skip reason: subject contains skip directive Change-Id: I22199be51d8664f0223ab89a833fe4793cc435ad
2019-04-09Add default code reviewers into OWNERS am: b23f58d578 am: ac3106461fChih-Hung Hsieh
am: c340e618f8 Change-Id: Id61e46e0c38aec99bf2ca11a736cc5ed5ccaba3e
2019-04-09resolve merge conflicts of 27c9838e0dfce837b6b610552eb0cc366ee457ec to ↵Sasha Smundak
qt-dev-plus-aosp am: 027e00787a Change-Id: Id0aa7b359b29689794405425801006afbfc829ff
2019-04-09[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
am: f1e36cfc25 -s ours am skip reason: subject contains skip directive Change-Id: I674846963db07579cf8b4c2ebc78d595a9311c7f
2019-04-09Add default code reviewers into OWNERS am: b23f58d578Chih-Hung Hsieh
am: ac3106461f Change-Id: If3f960a38dd6b2b0beed15cbd8153d04258dbb57
2019-04-08resolve merge conflicts of 27c9838e0dfce837b6b610552eb0cc366ee457ec to ↵Sasha Smundak
qt-dev-plus-aosp Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I525046b7edc62aa4fe647eb46545516d214cc2b2