commit | 2c507e78196e794e73c5b294421d724ea286fc91 | [log] [tgz] |
---|---|---|
author | Werner Lemberg <wl@gnu.org> | Sat Mar 19 06:40:17 2022 +0100 |
committer | android-t1 <android-t1@t2mobile.com> | Mon Jul 10 10:52:06 2023 +0800 |
tree | e4bf42f247a9edbb0d282fd1dc9a03dddf099ae5 | |
parent | 8c49c8a34b137ecb982d000395617825b7e239f8 [diff] |
DO NOT MERGE - Cherry-pick two upstream changes This cherry picks following two changes: 0c2bdb01a2e1d24a3e592377a6d0822856e10df2 22a0cccb4d9d002f33c1ba7a4b36812c7d4f46b5 Bug: 271680254 Test: N/A (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4ffa271ab538f57b65a65d434a2df9d3f8cd2f4a) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b0f8930701bf19229075cc930ad15813ff5fb07b) Merged-In: I42469df8e8b07221d64e3f8574c4f30110dbda7e Change-Id: I42469df8e8b07221d64e3f8574c4f30110dbda7e