jasonwshsu
2119458e6d
Save user's option when clicking 'Change setting' in triple-tap warning dialog
...
Root Cause: Did not save user's option when clicking 'Change setting'.
Solution: user did click on "save" before that dialog showed up, so it is their intention to save.
Fix: 228405345
Test: manual test
Change-Id: I28e3cb372419ec3b4f27ee84051f58d37e7c5c46
2022-05-01 00:05:21 +08:00
Bonian Chen
f542bd5484
Merge "[Settings] Avoid from crash UI when querying data usage" into tm-dev am: 5ef52de6b2 am: 2276920b9b am: e518b8848e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950069
Change-Id: I0c64101660dcab721481bc12c2301dca583c8e69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-30 00:02:08 +00:00
Bonian Chen
e72076fb7c
Merge "[Settings] Rename title of SIM UI when changed" into tm-dev am: 7bdf717410 am: 480c80f79d am: 226d1a137d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983870
Change-Id: I5222759cadf210f178b2190adb85be2b639a39a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-30 00:02:01 +00:00
TreeHugger Robot
941d8b875b
Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev am: 38989c9c6a am: fb214b99c0 am: a2e15fd03c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062823
Change-Id: I3e322e656b80c116ffd2c0b49872b4136618dbd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-30 00:01:55 +00:00
TreeHugger Robot
08233064f9
Merge "Show restricted message in Wi-Fi hotspot summary" into tm-dev am: 30bba3bbdb am: e76c4e0d0a am: a20c3a082b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062822
Change-Id: Icbc5db591f1239ab45b7f926053819961d846df5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-30 00:01:22 +00:00
Chaohui Wang
1fdbb3efa5
Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev am: 71e03076cd am: bda9049621 am: e54e855b1b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18013070
Change-Id: Ia20f27636ded72939cedb698e6dc72541b44c50c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-30 00:00:50 +00:00
Bonian Chen
907156d04f
Merge "[Settings] Avoid from crash UI when querying data usage" into tm-dev am: 5ef52de6b2 am: b32415b955
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950069
Change-Id: I9ba2ef3da6d52f15444a81a69a837f6ea072e546
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:51:39 +00:00
Bonian Chen
2718dea3f8
Merge "[Settings] Rename title of SIM UI when changed" into tm-dev am: 7bdf717410 am: 01e97e371e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983870
Change-Id: I50e2a9545b1d3ee49458038ed07df80c9a774e95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:51:34 +00:00
TreeHugger Robot
5c851b28f7
Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev am: 38989c9c6a am: d1c67e389d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062823
Change-Id: I7402200f611236e0c2c0d471ff7d09e305e57792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:51:28 +00:00
TreeHugger Robot
431c7ede2b
Merge "Show restricted message in Wi-Fi hotspot summary" into tm-dev am: 30bba3bbdb am: 1c16e6b314
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062822
Change-Id: I4ecd7932ed0100a15fd739ca8cade7394db0b31d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:51:18 +00:00
Chaohui Wang
74030a5bc5
Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev am: 71e03076cd am: 19356dae5d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18013070
Change-Id: I7d12f8797c346d1cef2be49c97d45a1f40a20ada
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:51:07 +00:00
Bonian Chen
e518b8848e
Merge "[Settings] Avoid from crash UI when querying data usage" into tm-dev am: 5ef52de6b2 am: 2276920b9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950069
Change-Id: Icb56a73efe4945099d13c8a6d81093c379050cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:45:22 +00:00
Bonian Chen
226d1a137d
Merge "[Settings] Rename title of SIM UI when changed" into tm-dev am: 7bdf717410 am: 480c80f79d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983870
Change-Id: I5d05f75c2a5d9fb24549cd89424a22a9e10383ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:45:03 +00:00
TreeHugger Robot
a2e15fd03c
Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev am: 38989c9c6a am: fb214b99c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062823
Change-Id: Ib350ef8ba53530293ac074ce39c9afdcac633ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:44:46 +00:00
TreeHugger Robot
a20c3a082b
Merge "Show restricted message in Wi-Fi hotspot summary" into tm-dev am: 30bba3bbdb am: e76c4e0d0a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062822
Change-Id: I165c9e086d54b87f6d2ed9c52ac47b0a711fcd8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:44:11 +00:00
Chaohui Wang
e54e855b1b
Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev am: 71e03076cd am: bda9049621
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18013070
Change-Id: Ib087add327143c0d12541e55ee586b01908af3a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:43:48 +00:00
Joshua Mccloskey
d1a232d24e
Merge "Fix final UDFPS enrollment haptic." into tm-dev am: 8f463f5c88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18083583
Change-Id: I2f8a9966f03a4362d2bb2f57269f31b8e556d197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:28:50 +00:00
Bonian Chen
b32415b955
Merge "[Settings] Avoid from crash UI when querying data usage" into tm-dev am: 5ef52de6b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950069
Change-Id: Ibfd126ebd63971e4e3b9f4f2429213c6039b2ffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:28:38 +00:00
Bonian Chen
01e97e371e
Merge "[Settings] Rename title of SIM UI when changed" into tm-dev am: 7bdf717410
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983870
Change-Id: I064026298e1dedeb9bdd8cc170c413aa20739deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:28:30 +00:00
TreeHugger Robot
d1c67e389d
Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev am: 38989c9c6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062823
Change-Id: I56cba95face2b3c989abc77ed0a520f29b6ed8b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:28:22 +00:00
TreeHugger Robot
1c16e6b314
Merge "Show restricted message in Wi-Fi hotspot summary" into tm-dev am: 30bba3bbdb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062822
Change-Id: Id017a3a3b3a67cd98f0727cd476a86b9ce248fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:28:08 +00:00
Chaohui Wang
19356dae5d
Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev am: 71e03076cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18013070
Change-Id: I43b852b5c2ae039e20f40ee0d91ed842caf79998
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:27:54 +00:00
Bonian Chen
2276920b9b
Merge "[Settings] Avoid from crash UI when querying data usage" into tm-dev am: 5ef52de6b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950069
Change-Id: Idac304bab5480e12813a2b99b875673abcbb7a75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:27:25 +00:00
Bonian Chen
480c80f79d
Merge "[Settings] Rename title of SIM UI when changed" into tm-dev am: 7bdf717410
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983870
Change-Id: I4531e4611b2b52e6d3153042d5d2a24d969c9c23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:27:17 +00:00
TreeHugger Robot
fb214b99c0
Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev am: 38989c9c6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062823
Change-Id: I288a6d876107c243b7e173e21cd396091a3503f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:27:08 +00:00
TreeHugger Robot
e76c4e0d0a
Merge "Show restricted message in Wi-Fi hotspot summary" into tm-dev am: 30bba3bbdb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062822
Change-Id: Ib95ca3193d615adf17c47deba31b1e6930753a6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:26:52 +00:00
Chaohui Wang
bda9049621
Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev am: 71e03076cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18013070
Change-Id: I860b9d924cf2da922f3154008a194fe2ad0e3288
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:26:34 +00:00
Joshua Mccloskey
8f463f5c88
Merge "Fix final UDFPS enrollment haptic." into tm-dev
2022-04-29 22:59:19 +00:00
Joshua McCloskey
b7f3001cea
Fix final UDFPS enrollment haptic.
...
Test: Verified both accessibility/non-accessibility flows
have correct haptic feedback.
Fixes: 229804277
Change-Id: I8623771016b9819d4211d07a19b50291a8b06cd9
Merged-In: I8623771016b9819d4211d07a19b50291a8b06cd9
2022-04-29 22:52:44 +00:00
Julia Reynolds
412e2dd771
Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev am: 312de956ec am: 58f0b1d55d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871961
Change-Id: Ia6db111ef04455edfed3664dac963cc70040e8aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 21:20:53 +00:00
TreeHugger Robot
22919487cf
Merge "Hide running time information for "Android System" entry" into tm-dev am: fc6cb73d29 am: fbffb07088
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062824
Change-Id: I41c275b1b725d9a7ddb5a18affb27cc771cc0dec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 21:19:32 +00:00
Calvin Pan
b7f5d4063f
Merge "Add unit test for AppLocalePickerActivity" into tm-dev am: 8ad2642b5f am: 215b87861a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903006
Change-Id: I6066777568412a7a9746efcf4ea53020eca92497
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 21:19:25 +00:00
Betty Chang
722776134a
Merge "[LE] Launch the MediaOutputBroadcastDialog when the current device is broadcasting" into tm-dev am: 7711207ba5 am: 4779a03d38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944166
Change-Id: Idb5c16caf94a5e687a32729b3650a1ac54729881
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 21:16:43 +00:00
Julia Reynolds
d9d09bf112
Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev am: 312de956ec am: 1f912cbfe3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871961
Change-Id: Ic82fa3118e725755090a78e3e13d6bed95ce3e3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 21:07:49 +00:00
TreeHugger Robot
d266df1531
Merge "Hide running time information for "Android System" entry" into tm-dev am: fc6cb73d29 am: 6708570e2c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062824
Change-Id: Ie0dbbd4df64d5bcd52e1715639228de0d7376b31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 21:07:30 +00:00
Calvin Pan
492fdaf058
Merge "Add unit test for AppLocalePickerActivity" into tm-dev am: 8ad2642b5f am: 38fac79ee6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903006
Change-Id: Ia51d0a83cddabc8ba6916aebc8305fa03478f01b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 21:07:24 +00:00
Betty Chang
3ea06f174e
Merge "[LE] Launch the MediaOutputBroadcastDialog when the current device is broadcasting" into tm-dev am: 7711207ba5 am: ec17c47421
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944166
Change-Id: I9fbbf6adfe050182ebbe2d1888d3ee7778b9fa4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 21:05:44 +00:00
Lucas Silva
e2ef52d6f1
Update dream settings logic to keep the customize button unselected.
...
Test: manually on device
Bug: 227717835
Fixed: 227717835
Change-Id: I4d796c3b7510baf07a670347fe4112a0b95d3036
2022-04-29 20:43:20 +00:00
Automerger Merge Worker
c17fe4d6ff
Merge "Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev am: 312de956ec am: e0d4b99626" into tm-d1-dev-plus-aosp am: 323cd11c86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871961
Change-Id: I5e98c83254916568c56eb1069ce3a2fc97b94025
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 19:33:37 +00:00
TreeHugger Robot
96e3d8a94b
Merge "Hide running time information for "Android System" entry" into tm-dev am: fc6cb73d29 am: 964aeabd9e am: 01b9111333
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062824
Change-Id: Ib213107e0a5e568174b26730a3aec15f45219fd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 19:33:06 +00:00
Calvin Pan
603abf2fb3
Merge "Add unit test for AppLocalePickerActivity" into tm-dev am: 8ad2642b5f am: 4f56ab0898 am: e32850726b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903006
Change-Id: I7ce87fce7174661986e185421388ab2feb984a6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 19:32:59 +00:00
Automerger Merge Worker
63df111bee
Merge "Merge "[LE] Launch the MediaOutputBroadcastDialog when the current device is broadcasting" into tm-dev am: 7711207ba5 am: 268fb81908" into tm-d1-dev-plus-aosp am: 1f616d666f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944166
Change-Id: I22ded50b941f17d74b71ebd771b20fc290715047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 19:30:58 +00:00
TreeHugger Robot
10b2a550fe
Merge "Remove loading spinner from Premium SMS access" into tm-dev am: 611db9e8be am: 4d5385e6e3 am: 1b4d1b14e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903584
Change-Id: I471fa0cbe6709f81504cf6d570c32de5743b6bd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 19:30:25 +00:00
TreeHugger Robot
30d1668d0c
Merge "Remove loading spinner from Premium SMS access" into tm-dev am: 611db9e8be am: 05eb3510d4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903584
Change-Id: I32937cf0b0a3ab1e73613c010a47bde1a6ff5673
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 19:28:43 +00:00
YK Hung
b6deeac7f3
Merge "Refine the BatteryUsageStats close() method invoke timing" into tm-dev am: 55fcb02aca am: 2e7695458f am: 2c3560fbbb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030883
Change-Id: I1c935a73a22eb9d056d463b958fe0447d0866e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 19:26:01 +00:00
YK Hung
f0d2cbe50a
Merge "Refine the BatteryUsageStats close() method invoke timing" into tm-dev am: 55fcb02aca am: 8cda726e7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030883
Change-Id: Ie101d7510eb31f00ab72b3303a4265a681e17bd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 19:14:01 +00:00
Prabal Singh
0b920ae555
Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e am: 13ce7c8eaf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601
Change-Id: Ifdb3f8124ccec41dc849292a73e019bc91b6c8c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 19:00:22 +00:00
Bonian Chen
2acd62e9c9
Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f am: 99de1117bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991
Change-Id: I6b75daebf7e38c9be53d92860e4f3b0cbc2ed225
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 19:00:09 +00:00
PETER LIANG
b503d57563
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94 am: d6e516f32f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953
Change-Id: I4f472beabfa87d2519f32e7b897ef07b69ae7b71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:59:57 +00:00
Julia Reynolds
8380ae2717
Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev am: 312de956ec am: e0d4b99626
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871961
Change-Id: Id08cbd0e1c333c35296b9048ed871073c6286fa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:29:27 +00:00