commit | a33e3e72f69031a0170940c6d8719001bf0700df | [log] [tgz] |
---|---|---|
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Thu Mar 02 03:50:05 2023 +0000 |
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Thu Mar 02 03:50:05 2023 +0000 |
tree | 043de55be6c62e10ee455713b988feac765fa023 | |
parent | 33962f65895769412da8ee556447b0f9c2807d69 [diff] | |
parent | 8516347fd1d4b8567c30f0868dd8e989527bd9b5 [diff] |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21359647', 'googleplex-android-review.googlesource.com/21403281'] into sparse-9595452-L64000000958893796. SPARSE_CHANGE: I19380198fcb5b0b3d7bc375fd427d122b133eeb9 SPARSE_CHANGE: Ib470797ee55db8b15e00c3f3b03742d705201e84 Change-Id: I4f6a89b47d226276a34173e7de6f5529581d0415