Commit Graph

105131 Commits

Author SHA1 Message Date
Jason Hsu
047cee8fc8 Merge changes from topic "hearingAidsInT" into tm-dev am: c3bbb709b9 am: 260e8f8ce2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17321711

Change-Id: Ie99902f11984809b04ec9be2cf60e6a5cb607257
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 01:14:25 +00:00
Jason Hsu
926beb08ff Merge changes from topic "hearingAidsInT" into tm-dev am: c3bbb709b9 am: de39f47311 am: 8846e29a7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17321711

Change-Id: I1e42a1708e166d78a3d3af72640c5f64f8b6bd4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 01:14:12 +00:00
TreeHugger Robot
e80ef180aa Merge "Update the 'is valid contentIntent' check" into tm-dev am: ee56c24ad8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18376072

Change-Id: Ia4fa223b9200074d8ccbf508754f81dcacbd1085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 01:04:13 +00:00
TreeHugger Robot
aecbda3822 Merge "Update the 'is valid contentIntent' check" into tm-dev am: ee56c24ad8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18376072

Change-Id: I27c60724c8d3c50f3d7e01561a0099e69569bf11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 00:59:43 +00:00
Jason Hsu
8846e29a7b Merge changes from topic "hearingAidsInT" into tm-dev am: c3bbb709b9 am: de39f47311
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17321711

Change-Id: Ia981237c5ee0d5676c51730a078b9ee273da27bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 00:59:11 +00:00
TreeHugger Robot
ee56c24ad8 Merge "Update the 'is valid contentIntent' check" into tm-dev 2022-05-14 00:59:01 +00:00
Jason Hsu
260e8f8ce2 Merge changes from topic "hearingAidsInT" into tm-dev am: c3bbb709b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17321711

Change-Id: Iaf0a85773cfc7cee8cd002ea0b35427044342ae2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 00:58:25 +00:00
Jason Hsu
de39f47311 Merge changes from topic "hearingAidsInT" into tm-dev am: c3bbb709b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17321711

Change-Id: Ieb1b469f29429cb1f542b03fcdced951f72aad9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 00:57:06 +00:00
Jason Hsu
c3bbb709b9 Merge changes from topic "hearingAidsInT" into tm-dev
* changes:
  Add 'Live Caption' preference for hearing aids device in Device details page
  Update summary in Accessibility -> Hearing aids
  Header for hearing aids now listed in one summary
2022-05-14 00:24:44 +00:00
tom hsu
9c7e29a228 [Panlingual][Settings] Add top intro on the top of app list. am: 36693d8096 am: 6b3741a170 am: 727f8befe8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349646

Change-Id: Ib1d355737fc70eae8ff17213bb25550cedc9f58c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 23:50:40 +00:00
tom hsu
727f8befe8 [Panlingual][Settings] Add top intro on the top of app list. am: 36693d8096 am: 6b3741a170
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349646

Change-Id: Ifd927cef892ad4036df24b555ff714c0c61d5342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 22:26:57 +00:00
tom hsu
f28a30ce81 [Panlingual][Settings] Add top intro on the top of app list. am: 36693d8096 am: 0f38ca7add am: 1212ddacd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349646

Change-Id: I6b8d3d984e2e7706384cc3e9d233f0cba66f6ef1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 22:07:05 +00:00
tom hsu
6b3741a170 [Panlingual][Settings] Add top intro on the top of app list. am: 36693d8096
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349646

Change-Id: Ia4c6a946ae822c61389574b0942145c99d98250d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 21:55:06 +00:00
tom hsu
b02b002b5b [Panlingual][Settings] Add top intro on the top of app list. am: 36693d8096 am: 0f38ca7add am: 9aeea1e813
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349646

Change-Id: Ia48fabdbe6d3b621494b972439ba7f5010956dcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 21:53:59 +00:00
tom hsu
1212ddacd3 [Panlingual][Settings] Add top intro on the top of app list. am: 36693d8096 am: 0f38ca7add
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349646

Change-Id: I2eaf282101a8eecef145186e23367db1557ec7aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 21:09:07 +00:00
tom hsu
9aeea1e813 [Panlingual][Settings] Add top intro on the top of app list. am: 36693d8096 am: 0f38ca7add
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349646

Change-Id: I54f7195fdb522d1ed1046b84f459b267bcd8b053
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 21:08:51 +00:00
tom hsu
0f38ca7add [Panlingual][Settings] Add top intro on the top of app list. am: 36693d8096
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349646

Change-Id: Ia5f4ad7794bfffbdb607d73dc0f65f979823a958
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 20:41:09 +00:00
jasonwshsu
384200a337 Add 'Live Caption' preference for hearing aids device in Device details page
Bug: 225117933
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsRelatedToolsControllerTest
Change-Id: Ic607fa7d10aa2049ab0852a86a57dd1d5d1ac7df
2022-05-14 03:36:01 +08:00
Automerger Merge Worker
70a695bf73 Merge "Merge "Add Hearable control slice in bluetooth device detail settings" into tm-dev am: 8a823a2c2c am: 69f35acf8b" into tm-d1-dev-plus-aosp am: f05a81b1b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350203

Change-Id: I903ea5c3b94d8960cc9bfa500582b09d57809256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 18:10:12 +00:00
TreeHugger Robot
6b479e5fc6 Merge "Add Hearable control slice in bluetooth device detail settings" into tm-dev am: 8a823a2c2c am: cba2f35898 am: aa5b3916ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350203

Change-Id: I7ef52086332af6083e3460ddae53bbf8f795c733
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 18:09:34 +00:00
TreeHugger Robot
8b88e4a62a Merge "Add refresh broadcast id checks" into tm-dev am: cd2d6f3e25 am: fa7b40c5da am: 00d4671bb6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18352143

Change-Id: Ide464059f3ba62fe136acfd30516b0d5cbff28ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 18:08:55 +00:00
SongFerng Wang
9fa6292f1d Merge "[LE broadcase sink] The LE device's isGroupOp is true" into tm-dev am: 8492dbb081 am: 2b6996c687 am: 2d164c3e4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349647

Change-Id: Id973ea9cff93d3dce739f93156811bd9a3f58a17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 18:08:47 +00:00
jasonwshsu
82d3bb2b73 Update summary in Accessibility -> Hearing aids
Bug: 225117843
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityHearingAidPreferenceControllerTest
Change-Id: I19c08474349e9ae98cd3f296ba8423f920d55fcf
2022-05-14 02:06:45 +08:00
TreeHugger Robot
3ba78072f4 Merge "Add Hearable control slice in bluetooth device detail settings" into tm-dev am: 8a823a2c2c am: 69f35acf8b am: 762a702a3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350203

Change-Id: I232ad5d77e9b0bf9f1205899ba668048626f9f6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 18:04:17 +00:00
TreeHugger Robot
30c3d5fa89 Merge "Add refresh broadcast id checks" into tm-dev am: cd2d6f3e25 am: fa7b40c5da am: 307672ebb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18352143

Change-Id: I408e289d02668cd8bd58d39fd67c9e7cbd3980fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 18:04:04 +00:00
SongFerng Wang
b3676c7fac Merge "[LE broadcase sink] The LE device's isGroupOp is true" into tm-dev am: 8492dbb081 am: 2b6996c687 am: c4f5ab82ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349647

Change-Id: Ib5e8bfc3760dc041130922969fd4dbb314804996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 18:03:56 +00:00
TreeHugger Robot
d3979c597c Merge "Support the managed profile deep links for large screen" into tm-dev am: 9c3c55ecd0 am: 8d098b4abe am: beac5fa720
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356912

Change-Id: I6fe9623248be89d1d743a9fddc8c65690a3fb931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 18:03:50 +00:00
TreeHugger Robot
ef46034fcc Merge "Update maximum length of device name for WiFi direct settings" into tm-dev am: b2eb731216 am: 2e8ae94dce am: fe976afbbf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356916

Change-Id: I062d26653bd342b120746fd9036c37176c3edf0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 18:03:43 +00:00
PETER LIANG
627d7c641b Merge "Updates the padding of the reset button to meet for SetupWizard style." into tm-dev am: fc481ece26 am: 1932476fae am: 4e389f18fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349802

Change-Id: I8876333315db0aa1e49257e1bb764e37aa117a69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 18:03:36 +00:00
PETER LIANG
d1674478ce Merge "Fix that once the phone is rotated to portrait orientation, the "Use TalkBack" toggle is truncated." into tm-dev am: ae1d7d3ef4 am: 0f6682541f am: 458e433495
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356908

Change-Id: I33948109f584935e7fd55e0ad6919c9df7a9147c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 18:03:30 +00:00
TreeHugger Robot
25b7f85585 Merge "Add refresh broadcast id checks" into tm-dev am: cd2d6f3e25 am: 5b85070968 am: d89ff59f04
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18352143

Change-Id: I8ca1f7fdd290e26ad40950a5d2bdcc8b01fd727f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:58:57 +00:00
SongFerng Wang
17aad4ec12 Merge "[LE broadcase sink] The LE device's isGroupOp is true" into tm-dev am: 8492dbb081 am: 9f67e13289 am: aff4267ceb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349647

Change-Id: Ib721b09d764cf2491c3f8871b10785457766d354
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:58:50 +00:00
TreeHugger Robot
6c86453837 Merge "Support the managed profile deep links for large screen" into tm-dev am: 9c3c55ecd0 am: 8d098b4abe am: d984323dee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356912

Change-Id: I3177579ac066ff1acaf737714e97533afee07df9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:58:43 +00:00
TreeHugger Robot
ea490ba41d Merge "Update maximum length of device name for WiFi direct settings" into tm-dev am: b2eb731216 am: 2e8ae94dce am: 377d3ecb61
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356916

Change-Id: I81a981ab5aec27d681dcddf2faecc354172f7f6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:58:36 +00:00
TreeHugger Robot
40416c7697 Merge "Support the managed profile deep links for large screen" into tm-dev am: 9c3c55ecd0 am: 2f492876d8 am: c73f90a38c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356912

Change-Id: I580edeee05e560ac07e5137ea14111dd1e4a07de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:58:29 +00:00
TreeHugger Robot
3be7f16a7d Merge "Update maximum length of device name for WiFi direct settings" into tm-dev am: b2eb731216 am: d1c5627cd2 am: 2d8fe22954
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356916

Change-Id: I3ff3bddfb688deeeab6a1b6fe007311f792a46a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:58:23 +00:00
Automerger Merge Worker
d42ed79848 Merge "Merge "Updates the padding of the reset button to meet for SetupWizard style." into tm-dev am: fc481ece26 am: 46f70f8fd1" into tm-d1-dev-plus-aosp am: 20b920737a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349802

Change-Id: I74ad02e1cb5131881b947971c19e95cee4cb2cb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:58:17 +00:00
PETER LIANG
9f85423ecf Merge "Updates the padding of the reset button to meet for SetupWizard style." into tm-dev am: fc481ece26 am: 1932476fae am: 75d582768a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349802

Change-Id: Ie3bd0627c4025bf1c99daff28c96747e098a6b75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:58:08 +00:00
Automerger Merge Worker
474da80d45 Merge "Merge "Fix that once the phone is rotated to portrait orientation, the "Use TalkBack" toggle is truncated." into tm-dev am: ae1d7d3ef4 am: 94b4ce5231" into tm-d1-dev-plus-aosp am: 0d12ce33ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356908

Change-Id: I41ae8d18b51120004b47050de0a03995c45c588b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:58:02 +00:00
PETER LIANG
8f1fc3b453 Merge "Fix that once the phone is rotated to portrait orientation, the "Use TalkBack" toggle is truncated." into tm-dev am: ae1d7d3ef4 am: 0f6682541f am: 84a46d17bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356908

Change-Id: If21e66169d049a4e0577bf3ebf41c33e63d2c349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:57:53 +00:00
Zoey Chen
b17a981a3c Merge "[Le Audio] Move BT QR code scanner from Settingslibs to Settings" into tm-dev am: 8045522453 am: 45bf373bdc am: 327089427c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332085

Change-Id: I08603fbc62c83c20f3dca8f310d6d8edd841ef4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:56:31 +00:00
Zoey Chen
f81746efa0 Merge "[Le Audio] Move BT QR code scanner from Settingslibs to Settings" into tm-dev am: 8045522453 am: d0f755aadf am: 9660d793c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332085

Change-Id: I6aab84322dadc9aaefc75a97c18ef093b2a16193
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:48:05 +00:00
TreeHugger Robot
762a702a3f Merge "Add Hearable control slice in bluetooth device detail settings" into tm-dev am: 8a823a2c2c am: 69f35acf8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350203

Change-Id: Ibda52c0679f465af74667f194b32e7e7b7ff5606
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:47:55 +00:00
TreeHugger Robot
307672ebb1 Merge "Add refresh broadcast id checks" into tm-dev am: cd2d6f3e25 am: fa7b40c5da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18352143

Change-Id: I0921c5e11ea2e4a2442fb7f045f6f25b23417e81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:47:39 +00:00
SongFerng Wang
c4f5ab82ce Merge "[LE broadcase sink] The LE device's isGroupOp is true" into tm-dev am: 8492dbb081 am: 2b6996c687
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349647

Change-Id: Iadd91edd3a169fbc3d8823a29278629d103d2e0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:47:32 +00:00
TreeHugger Robot
beac5fa720 Merge "Support the managed profile deep links for large screen" into tm-dev am: 9c3c55ecd0 am: 8d098b4abe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356912

Change-Id: If1b91ad7e9681ee00b8f54072e75aeb6c3089c22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:47:26 +00:00
TreeHugger Robot
fe976afbbf Merge "Update maximum length of device name for WiFi direct settings" into tm-dev am: b2eb731216 am: 2e8ae94dce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356916

Change-Id: I9ea3763b76580a5bacbaa2e9880f407913a528e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:47:21 +00:00
PETER LIANG
4e389f18fe Merge "Updates the padding of the reset button to meet for SetupWizard style." into tm-dev am: fc481ece26 am: 1932476fae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349802

Change-Id: I3e0bb2e2878d4fcd13bed21a4c4b402140547395
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:47:14 +00:00
PETER LIANG
458e433495 Merge "Fix that once the phone is rotated to portrait orientation, the "Use TalkBack" toggle is truncated." into tm-dev am: ae1d7d3ef4 am: 0f6682541f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356908

Change-Id: Iea416d1bb10294acef0652988e4688cdd91b2998
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:47:07 +00:00
Zoey Chen
286389f01c Merge "[Le Audio] Move BT QR code scanner from Settingslibs to Settings" into tm-dev am: 8045522453 am: 45bf373bdc am: cc6b988d4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332085

Change-Id: I61bb595072134bd5f08eee0c07ce9094713443bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:43:48 +00:00