commit | d45f0e49ab54065eb72d92aa3cc5f2152b0910b7 | [log] [tgz] |
---|---|---|
author | Werner Lemberg <wl@gnu.org> | Sat Mar 19 06:40:17 2022 +0100 |
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Thu May 11 18:39:17 2023 +0000 |
tree | 234ad317e206c974e924b6e8391f37f236de846a | |
parent | 3416d942a1d2940c6875f540a404045b5c761d66 [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:8abb5b963d8f3bac3224c09edff6dcbbd11bf508) Merged-In: I42469df8e8b07221d64e3f8574c4f30110dbda7e Change-Id: I42469df8e8b07221d64e3f8574c4f30110dbda7e