PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,553 Commits 1 Branch 0 Tags
65b45b6ecb97fb9a49b5beca6dc737840c60e9ca
Commit Graph

106553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
36a80cd8e6 Merge "Add null check for mIntent in ZenRulePreference to avoid potential crash risk" 2022-09-02 03:36:40 +00:00
SongFerng Wang
ea2cff12f8 Merge "Add owner for job handover" am: 89418428f6 am: 55f71f5496 am: 545db0361f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200280

Change-Id: Ibe979b946fcc259208c710311e2ae7b7bce2a2c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 13:06:57 +00:00
SongFerng Wang
545db0361f Merge "Add owner for job handover" am: 89418428f6 am: 55f71f5496 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200280

Change-Id: Ibeb10dbb48e3b2332f9056674a0a237ff28d5f93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 12:37:38 +00:00
SongFerng Wang
55f71f5496 Merge "Add owner for job handover" am: 89418428f6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200280

Change-Id: Ic94463eedc59971e8c5c162f2dfdad203c917508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 11:37:56 +00:00
SongFerng Wang
89418428f6 Merge "Add owner for job handover" 2022-09-01 10:58:19 +00:00
SongFerngWang
2d59130485 Add owner for job handover 
Will CP it into AOSP later.

Bug: 244524317
Test: NA
Change-Id: I9259596811cba08a21b78eebbe2f847e1aa6818c
 2022-09-01 16:09:35 +08:00
Shen Lin
b25f123d9f Add null check for mIntent in ZenRulePreference to avoid potential crash risk 
Bug: 244120502

Test: manual test, ZenRuleScheduleHelperTest for unit test.
Change-Id: Ib7338253783bb09b84b629f2dd891292d82f28b2
 2022-08-29 19:19:59 +08:00
Bill Yi
de4cbf230a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d60d670ccc -s ours am: 71d1cd4557 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739238

Change-Id: I73a6bf7a43107956349dc8bf6cdd78da6e68dc55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:38:03 +00:00
Bill Yi
99e160c962 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9bf84d822 -s ours am: a947d0a622 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739238

Change-Id: I92261d96ef6b8fde2b375575ccbfbf43c372b748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:37:50 +00:00
Bill Yi
77b9e7dd75 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 548e038af7 -s ours am: fae53cfbdf -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739235

Change-Id: I7c1bee9a073fbd39da951262de4a5ec3df49a6a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:37:36 +00:00
Bill Yi
68561fb157 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d3e63f1ab -s ours am: c10285fbdb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739235

Change-Id: I7f5693e7baa353d4e2258aa444277f47b5578995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:37:25 +00:00
Bill Yi
0a08da4ca8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d60d670ccc -s ours am: 34a6f0e456 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739238

Change-Id: Ia2fe60452dec4348ca6fe7d177f03942d65f9969
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:26:10 +00:00
Bill Yi
521735e2aa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9bf84d822 -s ours am: ad566bfccb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739238

Change-Id: I3657f8f740c010700a3199a50d9d20b58ff94441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:26:01 +00:00
Bill Yi
a371b6dd21 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 548e038af7 -s ours am: 1eb0406eff -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739235

Change-Id: Iba7623004fd8c2ca19ed2ca188e148b063924a70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:25:47 +00:00
Bill Yi
676cc83e25 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d3e63f1ab -s ours am: 00a98ec423 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739235

Change-Id: Id738ed8783958f6afdcc578e6f366cae70fd2192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:25:34 +00:00
Bill Yi
34a6f0e456 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d60d670ccc -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739238

Change-Id: I4ed75a7a45e5c83cc9243a0a5c64274987dbf19b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:22:11 +00:00
Bill Yi
ad566bfccb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9bf84d822 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739238

Change-Id: I5afaca68733eba118875ab8ffe8c35d71caccbd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:22:00 +00:00
Bill Yi
1eb0406eff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 548e038af7 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739235

Change-Id: I885fd6af7a8d76ac440e54f3026482de588bab2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:21:46 +00:00
Bill Yi
00a98ec423 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d3e63f1ab -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739235

Change-Id: I01a66f9a0e5e1b649f31ab2ab7538e5d8b62aedf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:21:32 +00:00
Bill Yi
71d1cd4557 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d60d670ccc -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739238

Change-Id: I25f8935aea893bb712cb3e002719360bb496092a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:19:32 +00:00
Bill Yi
a947d0a622 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9bf84d822 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739238

Change-Id: I2bb8103818802698946c8b9d952aabd03c43328f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:19:17 +00:00
Bill Yi
fae53cfbdf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 548e038af7 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739235

Change-Id: I26ecd8d012598281f8842dfa4e7189eba1480feb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:19:04 +00:00
Bill Yi
c10285fbdb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d3e63f1ab -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739235

Change-Id: I5f98cf99712cfd8123b0456d09171a72bcda33ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:18:51 +00:00
Bill Yi
d60d670ccc Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-08-28 01:55:00 +00:00
Bill Yi
548e038af7 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-08-28 01:55:00 +00:00
Bill Yi
507d0432ec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ed96a6cb86 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739242

Change-Id: I1da630c544a01a1143a233e1af11d883c3b58ac1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-27 21:30:03 +00:00
Bill Yi
ce0f625500 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6577aa89b6 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739242

Change-Id: I642292401b3114dcaf010861cc7ef3dfdbf19cb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-27 21:29:52 +00:00
Bill Yi
8033f5fb69 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 15380dd7b4 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739237

Change-Id: Ic697c5b6076ccd053351cb3df7219b65bc9a216b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-27 21:29:40 +00:00
Bill Yi
fa76853e84 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 631dfab65d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739237

Change-Id: Iaa9e4ce26c7e51be505cbed8b9cd02d4e824a647
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-27 21:29:21 +00:00
Bill Yi
ed96a6cb86 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-08-27 21:05:56 +00:00
Bill Yi
15380dd7b4 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-08-27 21:05:56 +00:00
Bonian Chen
6af2fb8578 Merge "[Settings] Not allow APN delete when adding is not an option" into tm-d1-dev am: 45051bb169 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746893

Change-Id: If948deb5fc93c3654e474bd4d4d588859affbfa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-27 04:12:07 +00:00
Bonian Chen
45051bb169 Merge "[Settings] Not allow APN delete when adding is not an option" into tm-d1-dev 2022-08-27 03:58:07 +00:00
Oli Lan
f70e351d1a Prevent exfiltration of system files via avatar picker. 
This adds mitigations to prevent system files being exfiltrated
via the settings content provider when a content URI is provided
as a chosen user image.

The mitigations are:

1) Copy the image to a new URI rather than the existing takePictureUri
prior to cropping.

2) Only allow a system handler to respond to the CROP intent.

This is a fixed version of ag/17003629, to address b/239513606.

Bug: 187702830
Test: build and check functionality
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
Change-Id: I98eea867f926c508456ec9bc654e24eeeffa0e54
 2022-08-26 19:46:02 +01:00
Automerger Merge Worker
34db7cdde9 Merge changes from topic "am-1f14ab54c2414b4ca60bb589f9ee6837" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours am: 29f4dd9a23 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours am: aacbd2e2ae -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours am: 089e0c7606 -s ours
 2022-08-26 18:33:31 +00:00
TreeHugger Robot
5d6defbe4c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours am: 29f4dd9a23 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133

Change-Id: I927d21f0655638ca2fc42d0336e9db0283520ce4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:32:23 +00:00
Bill Yi
a99db9e352 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours am: aacbd2e2ae -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133

Change-Id: I5f14460622da4d3cb2a836f043cd872dd234eff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:32:10 +00:00
Bill Yi
e2c968545f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours am: 089e0c7606 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745590

Change-Id: Ib4a34154bab2bac31d30af95ff10a1192137562e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:31:59 +00:00
TreeHugger Robot
be93a93ceb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours am: c006955815 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133

Change-Id: I340e0338e9ab57fce5a22807eeaf075a451dece2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:31:15 +00:00
Bill Yi
1620b3809f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours am: 58ea31040c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133

Change-Id: Ibea23be346fedd84bde90a3a78b60eb76c6eac01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:31:02 +00:00
Bill Yi
40e838cb44 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours am: 7a3ffa65cb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745590

Change-Id: Idc32ec7001b86babab1367eb6c802a5410e97796
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:30:52 +00:00
TreeHugger Robot
29f4dd9a23 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133

Change-Id: I751f3f087f95c4e51a4850958fea09fd65fb1edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:57:19 +00:00
Bill Yi
aacbd2e2ae [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133

Change-Id: I6d96dcd9e2da4c62d4a81aa2379dd52b6f03605e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:57:06 +00:00
Bill Yi
089e0c7606 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745590

Change-Id: I765f7749ff566563f7121463d3d3cad7790054aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:56:55 +00:00
TreeHugger Robot
c006955815 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133

Change-Id: I7b05ab7b867f2acb4b71038db45864e69ce28d80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:56:53 +00:00
Bill Yi
58ea31040c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133

Change-Id: I6c6697a911ebd5b1cc0dea82c85e82f009919803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:56:40 +00:00
Bill Yi
7a3ffa65cb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745590

Change-Id: Idb18a7c53c6222bf52f71b26ab064c9f2547b9ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:56:29 +00:00
TreeHugger Robot
2810928518 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133

Change-Id: I75db89938d39c6c1c576a31ecbd8d5bf7868991d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:47:08 +00:00
Bill Yi
c9ac950159 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133

Change-Id: I48e41e88032dfe727058fbce95de2efaf618757a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:46:49 +00:00
Bill Yi
bfd43e8459 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745590

Change-Id: Ie0bbb18017f81853c962c6cb34ee6eabaf9e619a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:46:35 +00:00