Commit graph

4286 commits

Author SHA1 Message Date
Vincent Palomares
04b6f59519 Add r4o6 perf setup script am: f78d6a1af5 am: 153c80c0c6 am: 2f52b38806
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18098722

Change-Id: I4293ad891e4755d21d58e6deef399f1e9ceb7d5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 17:47:52 +00:00
Roshan Pius
4c49cb69d4 Revert "move uwb feature to system_ext" am: 029a68a943 am: f999f53ec9 am: a434e7f277
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18091425

Change-Id: Id6fd2332b4f10b50255f03e06edd505890fb182f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 17:46:17 +00:00
Sal Savage
d0ad459798 Set default the Bluetooth class of device am: a14326cf30 am: d4a57574ae am: dbb1c55004
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17943944

Change-Id: I27ab0894917e3cdfeec44c01c3284992d6e3b164
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 17:30:11 +00:00
Stephane Lee
74b55a2124 Add thermal stats permissions for clearing am: 945cc1ede4 am: 5d1d8051c2 am: 78e60bba2b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18010869

Change-Id: I428de76c61e7939a1e072680c77baa1f2f0e821c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 17:29:04 +00:00
Alec Mouri
24464e2c9c Force gs101 to treat 170M as sRGB in SF am: 36c1e08127 am: 0f2108b6b9 am: 4fefa1a6d1
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17946173

Change-Id: Ia7e3ae3e6cef801c4b3ee97ac433c5afe703eb7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 17:28:46 +00:00
Jenny Ho
95cd43b049 dumpstate: add max77759_chg/max77729_pmic register dump am: 93baf1e97e am: 3ecef80127 am: a2c0b7b746 am: 1547656031
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17950760

Change-Id: If20df5efd5c46426802ae0e7e4737e842dfdb4ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:48:01 +00:00
Jenny Ho
62f2bfefa0 dumpstate: add max77759_chg/max77729_pmic register dump am: 93baf1e97e am: 173e417171 am: 3ea2717117 am: 277f977112
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17950760

Change-Id: If9e5030d107a07ad273882ab95bf925c84d5ad57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:47:36 +00:00
Jenny Ho
1547656031 dumpstate: add max77759_chg/max77729_pmic register dump am: 93baf1e97e am: 3ecef80127 am: a2c0b7b746
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17950760

Change-Id: I82c0df76930d7c102646d361cbec26b018360165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:15:44 +00:00
Jenny Ho
277f977112 dumpstate: add max77759_chg/max77729_pmic register dump am: 93baf1e97e am: 173e417171 am: 3ea2717117
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17950760

Change-Id: I0166b6fe71f70f0bbb7e838ec8103ca09cdd2d73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:15:11 +00:00
Jenny Ho
215995a87a dumpstate: add max77759_chg/max77729_pmic register dump am: 93baf1e97e am: 3ecef80127
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17950760

Change-Id: I0ce6a37eb6e6c4c4d707f9d09204885b26124bbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:06:10 +00:00
Jenny Ho
a2c0b7b746 dumpstate: add max77759_chg/max77729_pmic register dump am: 93baf1e97e am: 3ecef80127
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17950760

Change-Id: I75e30421a2be2038464cee6dbc2a97186e565851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:06:10 +00:00
Jenny Ho
3ea2717117 dumpstate: add max77759_chg/max77729_pmic register dump am: 93baf1e97e am: 173e417171
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17950760

Change-Id: If03a77f93f3764f44f9267541b5c441cd2c6a065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:57:52 +00:00
Jenny Ho
d7e778e4bc dumpstate: add max77759_chg/max77729_pmic register dump am: 93baf1e97e am: 85f539a4bd
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17950760

Change-Id: Iec6108a5073da66c1ac3acfc292ad2a4eb35accf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:57:14 +00:00
Jenny Ho
3ecef80127 dumpstate: add max77759_chg/max77729_pmic register dump am: 93baf1e97e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17950760

Change-Id: I48ccce6e81f8ed4b43cff3b8655966a6f0b82d06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:31:51 +00:00
Jenny Ho
85f539a4bd dumpstate: add max77759_chg/max77729_pmic register dump am: 93baf1e97e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17950760

Change-Id: I2f97118ad3fc8229fc6dbbc7963cfe5578c7234c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:31:17 +00:00
Jenny Ho
173e417171 dumpstate: add max77759_chg/max77729_pmic register dump am: 93baf1e97e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17950760

Change-Id: I20f56f01448c5b05d06f6d77c6880f9ad6d9dcfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:30:43 +00:00
Jenny Ho
93baf1e97e dumpstate: add max77759_chg/max77729_pmic register dump
Bug: 230360103
Signed-off-by: Jenny Ho <hsiufangho@google.com>
Change-Id: I4042e58370d70b97dc1e84e72a8c927b68e08b17
2022-05-03 10:39:20 +00:00
Sal Savage
aa30545269 [automerger skipped] Merge "Use the ?= operator so BT properties can be overridden" am: e4a5a19b77 am: 249302343c -s ours am: 0c750bfcc8 -s ours am: 560760c8a9 -s ours am: 44e0e1c9c9 -s ours
am skip reason: Merged-In I45b1786f5556ba3e7d493ea17dc955cd317a1156 with SHA-1 3cb7308fd5 is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2079814

Change-Id: Id3842c7d5dc911aaa7779167c01e66182b55703f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 06:18:33 +00:00
Sal Savage
44e0e1c9c9 [automerger skipped] Merge "Use the ?= operator so BT properties can be overridden" am: e4a5a19b77 am: 249302343c -s ours am: 0c750bfcc8 -s ours am: 560760c8a9 -s ours
am skip reason: Merged-In I45b1786f5556ba3e7d493ea17dc955cd317a1156 with SHA-1 3cb7308fd5 is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2079814

Change-Id: I49527301048b3828db1f13eeb34030dee062b330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 05:50:11 +00:00
Sal Savage
560760c8a9 [automerger skipped] Merge "Use the ?= operator so BT properties can be overridden" am: e4a5a19b77 am: 249302343c -s ours am: 0c750bfcc8 -s ours
am skip reason: Merged-In I45b1786f5556ba3e7d493ea17dc955cd317a1156 with SHA-1 3cb7308fd5 is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2079814

Change-Id: I3b6bb6ab120dfce9115d82f94cf8215d6aaf321d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 05:23:08 +00:00
Sal Savage
0c750bfcc8 [automerger skipped] Merge "Use the ?= operator so BT properties can be overridden" am: e4a5a19b77 am: 249302343c -s ours
am skip reason: Merged-In I45b1786f5556ba3e7d493ea17dc955cd317a1156 with SHA-1 3cb7308fd5 is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2079814

Change-Id: I64b6cb1ae8075da8bddbdaadbc4079522eeafbec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 02:22:43 +00:00
Sal Savage
249302343c Merge "Use the ?= operator so BT properties can be overridden" am: e4a5a19b77
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2079814

Change-Id: I8292a770a5296c9705b26f1b72f8187025b30982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 00:09:08 +00:00
Vincent Palomares
8704984c2b Add r4o6 perf setup script am: f78d6a1af5 am: 153c80c0c6 am: 9232abdc32 am: c2a263b416
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18098722

Change-Id: I49ba5ddd5820b6cf5a6e00d6299a155804387317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 23:41:11 +00:00
Vincent Palomares
569c7444b5 Add r4o6 perf setup script am: f78d6a1af5 am: d78e70877b am: f438bbed76 am: 69b9aaff7b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18098722

Change-Id: I740aa9821700bb707ce438a702a5a604728f1900
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 23:40:45 +00:00
Bob Badour
ba3d43767c [LSC] Add LOCAL_LICENSE_KINDS to device/google/gs101 am: 733255eb8a am: 9551dcd091 am: 4a26099af1 am: 5f8684836e am: 2167f0e884
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2079805

Change-Id: Ie4bd4517fc2ace5deef38fe80a64a55cb7b276dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 23:40:02 +00:00
Sal Savage
e4a5a19b77 Merge "Use the ?= operator so BT properties can be overridden" 2022-05-02 23:35:28 +00:00
Vincent Palomares
c2a263b416 Add r4o6 perf setup script am: f78d6a1af5 am: 153c80c0c6 am: 9232abdc32
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18098722

Change-Id: I999c3d0adccbdc0247b0d05008e7bf11617d6cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 23:12:25 +00:00
Vincent Palomares
69b9aaff7b Add r4o6 perf setup script am: f78d6a1af5 am: d78e70877b am: f438bbed76
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18098722

Change-Id: Id086c6a75269dfcb0d42c924417dc5610ec19cc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 23:11:59 +00:00
Bob Badour
2167f0e884 [LSC] Add LOCAL_LICENSE_KINDS to device/google/gs101 am: 733255eb8a am: 9551dcd091 am: 4a26099af1 am: 5f8684836e
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2079805

Change-Id: I7d4c7fad40380b1ede2b978dd47969800f36c281
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 23:11:34 +00:00
Vincent Palomares
2f52b38806 Add r4o6 perf setup script am: f78d6a1af5 am: 153c80c0c6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18098722

Change-Id: I9b22ab11c6f1d62a0c63772ee7d60bca2cfbaee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 23:09:16 +00:00
Vincent Palomares
adbed4508f Add r4o6 perf setup script am: f78d6a1af5 am: e21558350e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18098722

Change-Id: Iec93dc19d7323ea047a9fc752f637900b8c5bd07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:55:13 +00:00
Vincent Palomares
9232abdc32 Add r4o6 perf setup script am: f78d6a1af5 am: 153c80c0c6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18098722

Change-Id: Id8ca5d4eff546c55c643914e8519c4a3108e9701
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:54:58 +00:00
Vincent Palomares
f438bbed76 Add r4o6 perf setup script am: f78d6a1af5 am: d78e70877b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18098722

Change-Id: I1c92b3dce81e5286894c4e47db94ea8d8c1fb84b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:42:14 +00:00
Bob Badour
5f8684836e [LSC] Add LOCAL_LICENSE_KINDS to device/google/gs101 am: 733255eb8a am: 9551dcd091 am: 4a26099af1
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2079805

Change-Id: I1877b11118f7c34b02ec09a96dcd8cd21b043857
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:41:01 +00:00
Vincent Palomares
153c80c0c6 Add r4o6 perf setup script am: f78d6a1af5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18098722

Change-Id: I24d2be69efacdcb12016e30af4e8c08945580510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:31:22 +00:00
Vincent Palomares
e21558350e Add r4o6 perf setup script am: f78d6a1af5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18098722

Change-Id: I0f413786e77107d09c3470248a704a06363fa675
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:31:11 +00:00
Vincent Palomares
d78e70877b Add r4o6 perf setup script am: f78d6a1af5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18098722

Change-Id: Iab954d7a4577b2df7d377a2a760748c5de7c24bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:30:23 +00:00
Bob Badour
4a26099af1 [LSC] Add LOCAL_LICENSE_KINDS to device/google/gs101 am: 733255eb8a am: 9551dcd091
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2079805

Change-Id: I7ce838de503ea80c61b1460ff2d80e6496fd0f98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:08:44 +00:00
Bob Badour
9551dcd091 [LSC] Add LOCAL_LICENSE_KINDS to device/google/gs101 am: 733255eb8a
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2079805

Change-Id: I8ad98563970ff8a62980c155563fae2d81b8a8a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 21:32:11 +00:00
Sal Savage
15407fe4e9 Set default the Bluetooth class of device
The class of device is a string with a list of uint8t values:
90,2,12

The meaning is as follows:
{Service Field, Major class, Minor class}

Service Field: 0x5A -> 90
    Bit 17: Networking
    Bit 19: Capturing
    Bit 20: Object Transfer
    Bit 22: Telephony
MAJOR_CLASS: 0x02 -> 2 (Phone)
MINOR_CLASS: 0x0C -> 12 (Smart Phone)

Bug: 217452259
Test: make -j; -- check that bluetooth.device.class_of_device is
correct

Merged-In: I75a6fb83a6149f58372b7aa46ccc190fd4451ab0
Change-Id: I75a6fb83a6149f58372b7aa46ccc190fd4451ab0
2022-05-02 13:29:47 -07:00
Roshan Pius
d0281b33ac Revert "move uwb feature to system_ext" am: 029a68a943 am: db6977c5c0 am: 3a07a4aeea am: f64ea45f53
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18091425

Change-Id: Ie1b4b7f66feeb730c06252ef305ef97687b83c8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 11:33:06 +00:00
Roshan Pius
84f54aefc3 Revert "move uwb feature to system_ext" am: 029a68a943 am: f999f53ec9 am: d8e60c535f am: 64c08e74e6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18091425

Change-Id: Iadbd2af7f519d35a0fa8027cad7c6c0c4341d107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 11:29:22 +00:00
Treehugger Robot
25fe5a0197 [automerger skipped] Merge "Migrate IUsb implementation to AIDL" am: 798dbb39f5 am: 61384462ac -s ours am: 1b1906c1a3 -s ours am: f9b7b2de41 -s ours am: fb73d1dad3 -s ours
am skip reason: Merged-In I02753af4a41916b77ce110f9531504bf8c6a4691 with SHA-1 3c97a6bb68 is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2045080

Change-Id: Ie6cad8c4f91b8a6a9c88ff914ed34da3b45ec561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 10:18:00 +00:00
Sal Savage
1c2f4f6594 Set default the Bluetooth class of device am: a14326cf30 am: d4a57574ae am: 2b63435146 am: 3e5e4a059e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17943944

Change-Id: I3f63f0fff63d3272f772d934bf4d35b0b68a54a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 22:53:14 +00:00
Automerger Merge Worker
3747878631 Merge "Set default the Bluetooth class of device am: a14326cf30 am: 364fc9fda6" into tm-d1-dev-plus-aosp am: 750eb9463e am: 0fca601ef7
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17943944

Change-Id: I3db76c386b4b354098ecca9816a4899100248f98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 22:49:33 +00:00
Stephane Lee
51675682c3 Add thermal stats permissions for clearing am: 945cc1ede4 am: 5d1d8051c2 am: e3b5d72b63 am: 018b516931
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18010869

Change-Id: Ic0505f243c141c82323e4e09a1791b1b12857300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 22:46:45 +00:00
Stephane Lee
45354d3de7 Add thermal stats permissions for clearing am: 945cc1ede4 am: 9de9d6363f am: 2c3bd06251 am: dcbaf70b7a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18010869

Change-Id: Ibadec742ff98ee94b143a135e917c7d5254ad80b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 22:46:16 +00:00
Roshan Pius
f64ea45f53 Revert "move uwb feature to system_ext" am: 029a68a943 am: db6977c5c0 am: 3a07a4aeea
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18091425

Change-Id: I602bc33f508cf7d172d98da66390fbc2308c6595
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 22:41:45 +00:00
Alec Mouri
f863daccd6 Force gs101 to treat 170M as sRGB in SF am: 36c1e08127 am: 0d224fbe19 am: 2df3a6cf41 am: f7ac0265b0
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17946173

Change-Id: Iad578a5abbf4f2958f7c9722030a2b86489ebdbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 22:08:55 +00:00
Alec Mouri
e261f3073e Force gs101 to treat 170M as sRGB in SF am: 36c1e08127 am: 0f2108b6b9 am: ded8359ebb am: c60a6eb71e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17946173

Change-Id: I7fe1cf5fbf539af591c5772fa9b455f3c372c931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 21:59:29 +00:00